bolt 0.10.0 → 0.11.0

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

@@ -38,6 +38,7 @@ class Puppet::Application::Agent < Puppet::Application
       :digest => 'SHA256',
       :graph => true,
       :fingerprint => false,
+      :sourceaddress => nil,
     }.each do |opt,val|
       options[opt] = val
     end
@@ -59,6 +60,8 @@ class Puppet::Application::Agent < Puppet::Application
   option("--fingerprint")
   option("--digest DIGEST")
 
+  option("--sourceaddress IP_ADDRESS")
+
   option("--detailed-exitcodes") do |arg|
     options[:detailed_exitcodes] = true
   end
@@ -99,7 +102,7 @@ USAGE
 puppet agent [--certname <NAME>] [-D|--daemonize|--no-daemonize]
   [-d|--debug] [--detailed-exitcodes] [--digest <DIGEST>] [--disable [MESSAGE]] [--enable]
   [--fingerprint] [-h|--help] [-l|--logdest syslog|eventlog|<ABS FILEPATH>|console]
-  [--masterport <PORT>] [--noop] [-o|--onetime] [-t|--test]
+  [--masterport <PORT>] [--noop] [-o|--onetime] [--sourceaddress <IP_ADDRESS>] [-t|--test]
   [-v|--verbose] [-V|--version] [-w|--waitforcert <SECONDS>]
 
 
@@ -273,6 +276,10 @@ generated by running puppet agent with '--genconfig'.
   (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
   prefix for boolean settings on the command line.)
 
+* --sourceaddress:
+  Set the source IP address for transactions. This defaults to automatically selected.
+  (This is a Puppet setting, and can go in puppet.conf.)
+
 * --test:
   Enable the most common options used for testing. These are 'onetime',
   'verbose', 'no-daemonize', 'no-usecacheonfailure', 'detailed-exitcodes',

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

@@ -1,4 +1,5 @@
 require 'puppet/application/face_base'
 
 class Puppet::Application::Config < Puppet::Application::FaceBase
+  environment_mode :not_required
 end

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

@@ -155,8 +155,7 @@ you can specify '--server <servername>' as an argument.
   device run against only that device/certificate.
 
 * --user:
-  The user to run as. '--user=root' is required, even when run as root,
-  for runs that create device certificates or keys.
+  The user to run as.
 
 * --verbose:
   Turn on verbose reporting.

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

@@ -249,10 +249,18 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     require 'puppet/file_bucket/dipper'
     begin
       if options[:local] or options[:bucket]
-        path = options[:bucket] || Puppet[:bucketdir]
+        path = options[:bucket] || Puppet[:clientbucketdir]
         @client = Puppet::FileBucket::Dipper.new(:Path => path)
       else
-        @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
+        if Puppet[:server_list] && !Puppet[:server_list].empty?
+          server = Puppet[:server_list].first
+          @client = Puppet::FileBucket::Dipper.new(
+            :Server => server[0],
+            :Port => server[1]
+          )
+        else
+          @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
+        end
       end
     rescue => detail
       Puppet.log_exception(detail)

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

@@ -1,4 +1,5 @@
 require 'puppet/application/face_base'
 
 class Puppet::Application::Help < Puppet::Application::FaceBase
+  environment_mode :not_required
 end

data/vendored/puppet/lib/puppet/application_support.rb

@@ -14,9 +14,11 @@ module Puppet
     # before being set in a pushed Puppet Context.
     #
     # @param run_mode [Puppet::Util::RunMode] Puppet's current Run Mode.
+    # @param environment_mode [Symbol] optional, Puppet's
+    #   current Environment Mode. Defaults to :local
     # @return [void]
     # @api private
-    def self.push_application_context(run_mode)
+    def self.push_application_context(run_mode, environment_mode = :local)
       Puppet.push_context(Puppet.base_context(Puppet.settings), "Update for application settings (#{run_mode})")
       # This use of configured environment is correct, this is used to establish
       # the defaults for an application that does not override, or where an override
@@ -25,6 +27,9 @@ module Puppet
       configured_environment_name = Puppet[:environment]
       if run_mode.name == :agent
         configured_environment = Puppet::Node::Environment.remote(configured_environment_name)
+      elsif environment_mode == :not_required
+        configured_environment =
+          Puppet.lookup(:environments).get(configured_environment_name) || Puppet::Node::Environment.remote(configured_environment_name)
       else
         configured_environment = Puppet.lookup(:environments).get!(configured_environment_name)
       end

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

@@ -115,6 +115,9 @@ class Puppet::Configurer
     if options[:pluginsync]
       remote_environment_for_plugins = Puppet::Node::Environment.remote(@environment)
       download_plugins(remote_environment_for_plugins)
+
+      Puppet::GettextConfig.reset_text_domain('agent')
+      Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
     end
 
     facts_hash = {}
@@ -232,6 +235,9 @@ class Puppet::Configurer
     # If a cached catalog is explicitly requested, attempt to retrieve it. Skip the node request,
     # don't pluginsync and switch to the catalog's environment if we successfully retrieve it.
     if Puppet[:use_cached_catalog]
+      Puppet::GettextConfig.reset_text_domain('agent')
+      Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
+
       if catalog = prepare_and_retrieve_catalog_from_cache
         options[:catalog] = catalog
         @cached_catalog_status = 'explicitly_requested'
@@ -292,11 +298,10 @@ class Puppet::Configurer
       end
 
       current_environment = Puppet.lookup(:current_environment)
-      local_node_environment =
       if current_environment.name == @environment.intern
-        current_environment
+        local_node_environment = current_environment
       else
-        Puppet::Node::Environment.create(@environment,
+        local_node_environment = Puppet::Node::Environment.create(@environment,
                                          current_environment.modulepath,
                                          current_environment.manifest,
                                          current_environment.config_version)

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

@@ -298,10 +298,25 @@ module Puppet
     },
     :environment => {
         :default  => "production",
-        :desc     => "The environment Puppet is running in.  For clients
-          (e.g., `puppet agent`) this determines the environment itself, which
-          is used to find modules and much more.  For servers (i.e., `puppet master`)
-          this provides the default environment for nodes we know nothing about.",
+        :desc     => "The environment in which Puppet is running. For clients,
+          such as `puppet agent`, this determines the environment itself, which
+          Puppet uses to find modules and much more. For servers, such as `puppet master`,
+          this provides the default environment for nodes that Puppet knows nothing about.
+
+          When defining an environment in the `[agent]` section, this refers to the
+          environment that the agent requests from the master. The environment doesn't
+          have to exist on the local filesystem because the agent fetches it from the
+          master. This definition is used when running `puppet agent`.
+
+          When defined in the `[user]` section, the environment refers to the path that
+          Puppet uses to search for code and modules related to its execution. This
+          requires the environment to exist locally on the filesystem where puppet is
+          being executed. Puppet subcommands, including `puppet module` and
+          `puppet apply`, use this definition.
+
+          Given that the context and effects vary depending on the
+          [config section](https://puppet.com/docs/puppet/latest/config_file_main.html#config-sections)
+          in which the `environment` setting is defined, do not set it globally.",
         :short    => "E"
     },
     :environmentpath => {
@@ -902,19 +917,20 @@ EOT
     :digest_algorithm => {
         :default  => 'md5',
         :type     => :enum,
-        :values => ["md5", "sha256"],
+        :values => ["md5", "sha256", "sha384", "sha512", "sha224"],
         :desc     => 'Which digest algorithm to use for file resources and the filebucket.
-                      Valid values are md5, sha256. Default is md5.',
+                      Valid values are md5, sha256, sha384, sha512, sha224. Default is md5.',
     },
     :supported_checksum_types => {
-      :default => ['md5', 'sha256'],
+      :default => ['md5', 'sha256', 'sha384', 'sha512', 'sha224'],
       :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,
-                   md5lite, sha256, sha256lite, sha1, sha1lite, mtime, ctime.',
+                   md5lite, sha256, sha256lite, sha384, sha512, 
+		   sha1, sha1lite, sha224, mtime, ctime.',
       :hook    => proc do |value|
         values = munge(value)
-        valid   = ['md5', 'md5lite', 'sha256', 'sha256lite', 'sha1', 'sha1lite', 'mtime', 'ctime']
+        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}."
@@ -1085,6 +1101,10 @@ EOT
             and monitoring systems to determine if a puppet process is still in
             the process table.",
       },
+      :sourceaddress => {
+        :default    => nil,
+        :desc       => "The address the agent should use to initiate requests.",
+      },
       :bindaddress => {
         :default    => "*",
         :desc       => "The address a listening server should bind to.",

data/vendored/puppet/lib/puppet/environments.rb

@@ -382,6 +382,7 @@ module Puppet::Environments
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear(name)
       @cache.delete(name)
+      Puppet::GettextConfig.delete_text_domain(name)
     end
 
     # Clears all cached environments.
@@ -391,6 +392,7 @@ module Puppet::Environments
       @cache = {}
       @expirations.clear
       @next_expiration = END_OF_TIME
+      Puppet::GettextConfig.delete_environment_text_domains
     end
 
     # Clears all environments that have expired, either by exceeding their time to live, or

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

@@ -75,7 +75,7 @@ Puppet::Face.define(:config, '0.0.1') do
         if args.length == 1
           puts values.interpolate(args[0].to_sym)
         else
-          args.each do |setting_name|
+          args.sort.each do |setting_name|
             puts "#{setting_name} = #{values.interpolate(setting_name.to_sym)}"
           end
         end
@@ -106,6 +106,19 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
 
     when_invoked do |name, value, options|
+      if name == 'environment' && options[:section] == 'main'
+        Puppet.warning _(<<-EOM).chomp
+The environment should be set in either the `[user]`, `[agent]`, or `[master]`
+section. Variables set in the `[agent]` section are used when running
+`puppet agent`. Variables set in the `[user]` section are used when running
+various other puppet subcommands, like `puppet apply` and `puppet module`; these
+require the defined environment directory to exist locally. Set the config
+section by using the `--section` flag. For example,
+`puppet config --section user set environment foo`. For more information, see
+https://puppet.com/docs/puppet/latest/configuration.html#environment
+        EOM
+      end
+
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       Puppet::FileSystem.touch(path)
       Puppet::FileSystem.open(path, nil, 'r+:UTF-8') do |file|

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

@@ -150,7 +150,7 @@ Puppet::Face.define(:module, '1.0.0') do
     error_display_order = [:non_semantic_version, :version_mismatch, :missing]
     error_display_order.each do |type|
       unless @unmet_deps[type].empty?
-        @unmet_deps[type].keys.sort_by {|dep| dep }.each do |dep|
+        @unmet_deps[type].keys.sort.each do |dep|
           name    = dep.gsub('/', '-')
           errors  = @unmet_deps[type][dep][:errors]
           version = @unmet_deps[type][dep][:version]

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

@@ -49,8 +49,10 @@ Puppet::Face.define(:module, '1.0.0') do
       terminal_width = [Puppet::Util::Terminal.width, min_width].max
 
       columns = results[:answers].inject(min_widths) do |hash, result|
+        deprecated_buffer = result['deprecated_at'].nil? ? 0 : 11 # ' DEPRECATED'.length
+
         {
-          'full_name' => [ hash['full_name'], result['full_name'].length          ].max,
+          'full_name' => [ hash['full_name'], result['full_name'].length + deprecated_buffer ].max,
           'desc'      => [ hash['desc'],      result['desc'].length               ].max,
           'author'    => [ hash['author'],    "@#{result['author']}".length       ].max,
           'tag_list'  => [ hash['tag_list'],  result['tag_list'].join(' ').length ].max,
@@ -86,6 +88,7 @@ Puppet::Face.define(:module, '1.0.0') do
       format % [ headers['full_name'], headers['desc'], headers['author'], headers['tag_list'] ] +
       results[:answers].map do |match|
         name, desc, author, keywords = %w{full_name desc author tag_list}.map { |k| match[k] }
+        name += " #{colorize(:red, 'DEPRECATED')}" unless match['deprecated_at'].nil?
         desc = desc[0...(columns['desc'] - 3)] + '...' if desc.length > columns['desc']
         highlight[format % [ name.sub('/', '-'), desc, "@#{author}", [keywords].flatten.join(' ') ]]
       end.join

data/vendored/puppet/lib/puppet/forge.rb

@@ -166,6 +166,8 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     def prepare
       return @unpacked_into if @unpacked_into
 
+      Puppet.warning "#{@metadata['name']} has been deprecated by its author! View module on Puppet Forge for more info." if deprecated?
+
       download(@data['file_uri'], tmpfile)
       validate_checksum(tmpfile, @data['file_md5'])
       unpack(tmpfile, tmpdir)
@@ -209,6 +211,10 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
         raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
       end
     end
+
+    def deprecated?
+      @data['module'] && (@data['module']['deprecated_at'] != nil)
+    end
   end
 
   private

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

@@ -0,0 +1,32 @@
+# The `convert_to(value, type)` is a convenience function does the same as `new(type, value)`.
+# The difference in the argument ordering allows it to be used in chained style for
+# improved readability "left to right".
+#
+# When the function is given a lambda, it is called with the converted value, and the function
+# returns what the lambda returns, otherwise the converted value.
+#
+# @example 'convert_to' instead of 'new'
+#
+# ~~~ puppet
+#   # using new operator - that is "calling the type" with operator ()
+#   Hash(Array("abc").map |$i,$v| { [$i, $v] })
+#
+#   # using 'convert_to'
+#   "abc".convert_to(Array).map |$i,$v| { [$i, $v] }.convert_to(Hash)
+#
+# ~~~
+#
+# @since 5.4.0
+#
+Puppet::Functions.create_function(:convert_to) do
+  dispatch :convert_to do
+    param 'Any', :value
+    param 'Type', :type
+    optional_block_param 'Callable[1,1]', :block
+  end
+
+  def convert_to(value, type, &block)
+    result = call_function('new', type, value)
+    block_given? ? yield(result) : result
+  end
+end

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

@@ -6,9 +6,10 @@ module Puppet::GettextConfig
   POSIX_PATH = File.absolute_path('../../../../../share/locale', File.dirname(__FILE__))
   WINDOWS_PATH = File.absolute_path('../../../../../../../puppet/share/locale', File.dirname(__FILE__))
 
+  DEFAULT_TEXT_DOMAIN = 'default-text-domain'
+
   # 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 'fast_gettext'
     require 'locale'
@@ -34,33 +35,123 @@ module Puppet::GettextConfig
   end
 
   # @api private
-  # Whether translations have been loaded for a given project
-  # @param project_name [String] the project whose translations we are querying
-  # @return [Boolean] true if translations have been loaded for the project
-  def self.translations_loaded?(project_name)
-    return false unless gettext_loaded?
-    if @loaded_repositories[project_name]
-      return true
+  # Returns the currently selected locale from FastGettext,
+  # or 'en' of gettext has not been loaded
+  # @return [String] the active locale
+  def self.current_locale
+    if gettext_loaded?
+      return FastGettext.default_locale
     else
-      return false
+      return 'en'
     end
   end
 
   # @api private
-  # Creates a new empty text domain with the given name, replacing
-  # any existing domain with that name, then switches to using
-  # that domain. Also clears the cache of loaded translations.
-  # @param domain_name [String] the name of the domain to create
-  def self.create_text_domain(domain_name)
-    return unless gettext_loaded?
-    # Clear the cache of loaded translation repositories
-    @loaded_repositories = {}
-    FastGettext.add_text_domain(domain_name, type: :chain, chain: [])
-    #TODO remove this when we start managing domains per environment
-    FastGettext.default_text_domain = domain_name
+  # Returns a list of the names of the loaded text domains
+  # @return [[String]] the names of the loaded text domains
+  def self.loaded_text_domains
+    return [] if @gettext_disabled || !gettext_loaded?
+
+    return FastGettext.translation_repositories.keys
+  end
+
+  # @api private
+  # Clears the translation repository for the given text domain,
+  # creating it if it doesn't exist, then adds default translations
+  # and switches to using this domain.
+  # @param [String] domain_name the name of the domain to create
+  def self.reset_text_domain(domain_name)
+    return if @gettext_disabled || !gettext_loaded?
+
+    FastGettext.add_text_domain(domain_name,
+                                type: :chain,
+                                chain: [],
+                                report_warning: false)
+    copy_default_translations(domain_name)
     FastGettext.text_domain = domain_name
   end
 
+  # @api private
+  # Creates a default text domain containing the translations for
+  # Puppet as the start of chain. When semantic_puppet gets initialized,
+  # its translations are added to this chain. This is used as a cache
+  # so that all non-module translations only need to be loaded once as
+  # we create and reset environment-specific text domains.
+  #
+  # @return true if Puppet translations were successfully loaded, false
+  # otherwise
+  def self.create_default_text_domain
+    return if @gettext_disabled || !gettext_loaded?
+
+    FastGettext.add_text_domain(DEFAULT_TEXT_DOMAIN,
+                                type: :chain,
+                                chain: [],
+                                report_warning: false)
+    FastGettext.default_text_domain = DEFAULT_TEXT_DOMAIN
+
+    load_translations('puppet', puppet_locale_path, translation_mode(puppet_locale_path))
+  end
+
+  # @api private
+  # Switches the active text domain, if the requested domain exists.
+  # @param [String] domain_name the name of the domain to switch to
+  def self.use_text_domain(domain_name)
+    return if @gettext_disabled || !gettext_loaded?
+
+    if FastGettext.translation_repositories.include?(domain_name)
+      FastGettext.text_domain = domain_name
+    end
+  end
+
+  # @api private
+  # Delete all text domains.
+  def self.delete_all_text_domains
+    FastGettext.translation_repositories.clear
+    FastGettext.default_text_domain = nil
+  end
+
+  # @api private
+  # Deletes the text domain with the given name
+  # @param [String] domain_name the name of the domain to delete
+  def self.delete_text_domain(domain_name)
+    return if @gettext_disabled || !gettext_loaded?
+
+    FastGettext.translation_repositories.delete(domain_name)
+  end
+
+  # @api private
+  # Deletes all text domains except the default one
+  def self.delete_environment_text_domains
+    return if @gettext_disabled || !gettext_loaded?
+
+    FastGettext.translation_repositories.keys.each do |key|
+      # do not clear default translations
+      next if key == DEFAULT_TEXT_DOMAIN
+
+      FastGettext.translation_repositories.delete(key)
+    end
+  end
+
+  # @api private
+  # Adds translations from the default text domain to the specified
+  # text domain. Creates the default text domain if one does not exist
+  # (this will load Puppet's translations).
+  #
+  # Since we are currently (Nov 2017) vendoring semantic_puppet, in normal
+  # flows these translations will be copied along with Puppet's.
+  #
+  # @param [String] domain_name the name of the domain to add translations to
+  def self.copy_default_translations(domain_name)
+    return if @gettext_disabled || !gettext_loaded?
+
+    if FastGettext.default_text_domain.nil?
+      create_default_text_domain
+    end
+
+    puppet_translations = FastGettext.translation_repositories[FastGettext.default_text_domain].chain
+    FastGettext.translation_repositories[domain_name].chain.push(*puppet_translations)
+  end
+
   # @api private
   # Search for puppet gettext config files
   # @return [String] path to the config, or nil if not found
@@ -78,7 +169,7 @@ module Puppet::GettextConfig
 
   # @api private
   # Determine which translation file format to use
-  # @param conf_path [String] the path to the gettext config file
+  # @param [String] conf_path the path to the gettext config file
   # @return [Symbol] :mo if in a package structure, :po otherwise
   def self.translation_mode(conf_path)
     if WINDOWS_PATH == conf_path || POSIX_PATH == conf_path
@@ -96,11 +187,15 @@ module Puppet::GettextConfig
 
   # @api private
   # Attempt to load tranlstions for the given project.
-  # @param project_name [String] the project whose translations we want to load
-  # @param locale_dir [String] the path to the directory containing translations
-  # @param file_format [Symbol] translation file format to use, either :po or :mo
+  # @param [String] project_name the project whose translations we want to load
+  # @param [String] locale_dir the path to the directory containing translations
+  # @param [Symbol] file_format translation file format to use, either :po or :mo
   # @return true if initialization succeeded, false otherwise
   def self.load_translations(project_name, locale_dir, file_format)
+    if project_name.nil? || project_name.empty?
+      raise Puppet::Error, "A project name must be specified in order to initialize translations."
+    end
+
     return false if @gettext_disabled || !@gettext_loaded
 
     return false unless locale_dir && Puppet::FileSystem.exist?(locale_dir)
@@ -109,10 +204,6 @@ module Puppet::GettextConfig
       raise Puppet::Error, "Unsupported translation file format #{file_format}; please use :po or :mo"
     end
 
-    if project_name.nil? || project_name.empty?
-      raise Puppet::Error, "A project name must be specified in order to initialize translations."
-    end
-
     add_repository_to_domain(project_name, locale_dir, file_format)
     return true
   end
@@ -120,27 +211,34 @@ module Puppet::GettextConfig
   # @api private
   # Add the translations for this project to the domain's repository chain
   # chain for the currently selected text domain, if needed.
-  # @param project_name [String] the name of the project for which to load translations
-  # @param locale_dir [String] the path to the directory containing translations
-  # @param file_format [Symbol] the fomat of the translations files, :po or :mo
+  # @param [String] project_name the name of the project for which to load translations
+  # @param [String] locale_dir the path to the directory containing translations
+  # @param [Symbol] file_format the fomat of the translations files, :po or :mo
   def self.add_repository_to_domain(project_name, locale_dir, file_format)
-    # check if we've already loaded these transltaions
+    return if @gettext_disabled || !gettext_loaded?
+
     current_chain = FastGettext.translation_repositories[FastGettext.text_domain].chain
-    return current_chain if @loaded_repositories[project_name]
 
     repository = FastGettext::TranslationRepository.build(project_name,
                                                           path: locale_dir,
                                                           type: file_format,
-                                                          ignore_fuzzy: false)
-    @loaded_repositories[project_name] = true
+                                                          report_warning: false)
     current_chain << repository
   end
 
+  # @api private
+  # Sets FastGettext's locale to the current system locale
+  def self.setup_locale
+    return if @gettext_disabled || !gettext_loaded?
+
+    set_locale(Locale.current.language)
+  end
+
   # @api private
   # Sets the language in which to display strings.
-  # @param locale [String] the language portion of a locale string (e.g. "ja")
+  # @param [String] locale the language portion of a locale string (e.g. "ja")
   def self.set_locale(locale)
-    return if !gettext_loaded?
+    return if @gettext_disabled || !gettext_loaded?
     # make sure we're not using the `available_locales` machinery
     FastGettext.default_available_locales = nil