bolt 0.21.1 → 0.21.2

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

@@ -1,256 +1,14 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:generate) do
     summary _("Generate boilerplate for a new module.")
-    description <<-EOT
-      Generates boilerplate for a new module by creating the directory
-      structure and files recommended for the Puppet community's best practices.
+    #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+    description _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
 
-      A module may need additional directories beyond this boilerplate
-      if it provides plugins, files, or templates.
-    EOT
-
-    returns _("Array of Pathname objects representing paths of generated files.")
-
-    examples <<-EOT
-      Generate a new module in the current directory:
-
-      $ puppet module generate puppetlabs-ssh
-      We need to create a metadata.json file for this module.  Please answer the
-      following questions; if the question is not applicable to this module, feel free
-      to leave it blank.
-
-      Puppet uses Semantic Versioning (semver.org) to version modules.
-      What version is this module?  [0.1.0]
-      -->
-
-      Who wrote this module?  [puppetlabs]
-      -->
-
-      What license does this module code fall under?  [Apache-2.0]
-      -->
-
-      How would you describe this module in a single sentence?
-      -->
-
-      Where is this module's source code repository?
-      -->
-
-      Where can others go to learn more about this module?
-      -->
-
-      Where can others go to file issues about this module?
-      -->
-
-      ----------------------------------------
-      {
-        "name": "puppetlabs-ssh",
-        "version": "0.1.0",
-        "author": "puppetlabs",
-        "summary": null,
-        "license": "Apache-2.0",
-        "source": "",
-        "project_page": null,
-        "issues_url": null,
-        "dependencies": [
-          {
-            "name": "puppetlabs-stdlib",
-            "version_requirement": ">= 1.0.0"
-          }
-        ]
-      }
-      ----------------------------------------
-
-      About to generate this metadata; continue? [n/Y]
-      -->
-
-      Notice: Generating module at /Users/username/Projects/puppet/puppetlabs-ssh...
-      Notice: Populating ERB templates...
-      Finished; module generated in puppetlabs-ssh.
-      puppetlabs-ssh/manifests
-      puppetlabs-ssh/manifests/init.pp
-      puppetlabs-ssh/metadata.json
-      puppetlabs-ssh/README.md
-      puppetlabs-ssh/spec
-      puppetlabs-ssh/spec/spec_helper.rb
-      puppetlabs-ssh/tests
-      puppetlabs-ssh/tests/init.pp
-    EOT
-
-    option "--skip-interview" do
-      summary _("Bypass the interactive metadata interview")
-      description <<-EOT
-        Do not attempt to perform a metadata interview.  Primarily useful for automatic
-        execution of `puppet module generate`.
-      EOT
-    end
-
-    arguments _("<name>")
-
-    when_invoked do |name, options|
-      # Since we only want to interview if it's being rendered to the console
-      # (i.e. when invoked with `puppet module generate`), we can't do any work
-      # here in the when_invoked block. The result of this block is then
-      # passed to each renderer, which will handle it appropriately; by
-      # returning a simple message like this, every renderer will simply output
-      # the string.
-      # Our `when_rendering :console` handler will ignore this value and
-      # actually generate the module.
-      #
-      # All this is necessary because it is not possible at this point in time
-      # to know what the destination of the output is.
-      _("This format is not supported by this action.")
-    end
-
-    when_rendering :console do |_, name, options|
-      Puppet::ModuleTool.set_option_defaults options
-
-      begin
-        # A default dependency for all newly generated modules is being
-        # introduced as a substitute for the comments we used to include in the
-        # previous module data specifications. While introducing a default
-        # dependency is less than perfectly desirable, the cost is low, and the
-        # syntax is obtuse enough to justify its inclusion.
-        metadata = Puppet::ModuleTool::Metadata.new.update(
-          'name' => name,
-          'version' => '0.1.0',
-          'dependencies' => [
-            { 'name' => 'puppetlabs-stdlib', 'version_requirement' => '>= 1.0.0' }
-          ]
-        )
-      rescue ArgumentError
-        msg = _("Could not generate directory %{name}, you must specify a dash-separated username and module name.") % { name: name.inspect }
-        raise ArgumentError, msg, $!.backtrace
-      end
-
-      dest = Puppet::ModuleTool::Generate.destination(metadata)
-      result = Puppet::ModuleTool::Generate.generate(metadata, options[:skip_interview])
-
-      path = dest.relative_path_from(Pathname.pwd)
-      puts _("Finished; module generated in %{path}.") % { path: path }
-      result.join("\n")
+    when_invoked do |*args|
+      #TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      raise _("This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
     end
 
     deprecate
   end
 end
-
-module Puppet::ModuleTool::Generate
-  module_function
-
-  def generate(metadata, skip_interview = false)
-    #TRANSLATORS 'puppet module generate' is the name of the puppet command and 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated. 
-    Puppet.deprecation_warning _("`puppet module generate` is deprecated and will be removed in a future release. This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
-
-    interview(metadata) unless skip_interview
-    destination = duplicate_skeleton(metadata)
-    all_files = destination.basename + '**/*'
-
-    return Dir[all_files.to_s]
-  end
-
-  def interview(metadata)
-    puts _("We need to create a metadata.json file for this module.  Please answer the
-    following questions; if the question is not applicable to this module, feel free
-    to leave it blank.")
-
-    begin
-      puts
-      puts _("Puppet uses Semantic Versioning (semver.org) to version modules.")
-      puts _("What version is this module?  [%{version}]") % { version: metadata.version }
-      metadata.update 'version' => user_input(metadata.version)
-    rescue
-      Puppet.err _("We're sorry, we could not parse that as a Semantic Version.")
-      retry
-    end
-
-    puts
-    puts _("Who wrote this module?  [%{author}]") % { author: metadata.author }
-    metadata.update 'author' => user_input(metadata.author)
-
-    puts
-    puts _("What license does this module code fall under?  [%{license}]") % { license: metadata.license }
-    metadata.update 'license' => user_input(metadata.license)
-
-    puts
-    puts _("How would you describe this module in a single sentence?")
-    metadata.update 'summary' => user_input(metadata.summary)
-
-    puts
-    puts _("Where is this module's source code repository?")
-    metadata.update 'source' => user_input(metadata.source)
-
-    puts
-    puts _("Where can others go to learn more about this module?%{project_page}") % { project_page: metadata.project_page && "  [#{metadata.project_page}]" }
-    metadata.update 'project_page' => user_input(metadata.project_page)
-
-    puts
-    puts _("Where can others go to file issues about this module?%{issues}") % { issues: metadata.issues_url && "  [#{metadata.issues_url}]" }
-    metadata.update 'issues_url' => user_input(metadata.issues_url)
-
-    puts
-    puts '-' * 40
-    puts metadata.to_json
-    puts '-' * 40
-    puts
-    puts _("About to generate this metadata; continue? [n/Y]")
-
-    if user_input('Y') !~ /^y(es)?$/i
-      puts _("Aborting...")
-      exit 0
-    end
-  end
-
-  def user_input(default=nil)
-    print '--> '
-    input = STDIN.gets.chomp.strip
-    input = default if input == ''
-    return input
-  end
-
-  def destination(metadata)
-    return @dest if defined? @dest
-    @dest = Pathname.pwd + metadata.name
-    raise ArgumentError, _("%{destination} already exists.") % { destination: @dest } if @dest.exist?
-    return @dest
-  end
-
-  def duplicate_skeleton(metadata)
-    dest = destination(metadata)
-
-    puts
-    Puppet.notice _("Generating module at %{dest}...") % { dest: dest }
-    FileUtils.cp_r skeleton_path, dest
-
-    populate_templates(metadata, dest)
-    return dest
-  end
-
-  def populate_templates(metadata, destination)
-    Puppet.notice _("Populating templates...")
-
-    formatters = {
-      :erb      => proc { |data, ctx| ERB.new(data).result(ctx) },
-      :template => proc { |data, _| data },
-    }
-
-    formatters.each do |type, block|
-      templates = destination + "**/*.#{type}"
-
-      Dir.glob(templates.to_s, File::FNM_DOTMATCH).each do |erb|
-        path = Pathname.new(erb)
-        content = block[path.read, binding]
-
-        target = path.parent + path.basename(".#{type}")
-        target.open('w:UTF-8') { |f| f.write(content) }
-        path.unlink
-      end
-    end
-  end
-
-  def skeleton_path
-    return @path if defined? @path
-    path = Pathname(Puppet.settings[:module_skeleton_dir])
-    path = Pathname(__FILE__).dirname + '../../module_tool/skeleton/templates/generator' unless path.directory?
-    @path = path
-  end
-end

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

@@ -6,6 +6,7 @@ module Puppet::GettextConfig
   POSIX_PATH = File.absolute_path('../../../../../share/locale', File.dirname(__FILE__))
   WINDOWS_PATH = File.absolute_path('../../../../../../../puppet/share/locale', File.dirname(__FILE__))
 
+  # This is the only domain name that won't be a symbol, making it unique from environments.
   DEFAULT_TEXT_DOMAIN = 'default-text-domain'
 
   # Load gettext helpers and track whether they're available.
@@ -59,10 +60,12 @@ module Puppet::GettextConfig
   # 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
+  # @param [String, Symbol] domain_name the name of the domain to create
   def self.reset_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
+    Puppet.debug "Reset text domain to #{domain_name.inspect}"
     FastGettext.add_text_domain(domain_name,
                                 type: :chain,
                                 chain: [],
@@ -71,6 +74,18 @@ module Puppet::GettextConfig
     FastGettext.text_domain = domain_name
   end
 
+  # @api private
+  # Resets the thread's configured text_domain to the default text domain.
+  # In Puppet Server, thread A may process a compile request that configures
+  # a domain, while thread B may invalidate that environment and delete the
+  # domain. That leaves thread A with an invalid text_domain selected.
+  # To avoid that, clear_text_domain after any processing that needs the
+  # non-default text domain.
+  def self.clear_text_domain
+    return if @gettext_disabled || !gettext_loaded?
+    FastGettext.text_domain = nil
+  end
+
   # @api private
   # Creates a default text domain containing the translations for
   # Puppet as the start of chain. When semantic_puppet gets initialized,
@@ -94,12 +109,16 @@ module Puppet::GettextConfig
 
   # @api private
   # Switches the active text domain, if the requested domain exists.
-  # @param [String] domain_name the name of the domain to switch to
+  # @param [String, Symbol] domain_name the name of the domain to switch to
   def self.use_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
     if FastGettext.translation_repositories.include?(domain_name)
+      Puppet.debug "Use text domain #{domain_name.inspect}"
       FastGettext.text_domain = domain_name
+    else
+      Puppet.debug "Requested unknown text domain #{domain_name.inspect}"
     end
   end
 
@@ -113,13 +132,17 @@ module Puppet::GettextConfig
 
   # @api private
   # Deletes the text domain with the given name
-  # @param [String] domain_name the name of the domain to delete
+  # @param [String, Symbol] domain_name the name of the domain to delete
   def self.delete_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
-    FastGettext.translation_repositories.delete(domain_name)
+    deleted = FastGettext.translation_repositories.delete(domain_name)
     if FastGettext.text_domain == domain_name
+      Puppet.debug "Deleted current text domain #{domain_name.inspect}: #{!deleted.nil?}"
       FastGettext.text_domain = nil
+    else
+      Puppet.debug "Deleted text domain #{domain_name.inspect}: #{!deleted.nil?}"
     end
   end
 
@@ -145,7 +168,7 @@ module Puppet::GettextConfig
   # 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
+  # @param [Symbol] domain_name the name of the domain to add translations to
   def self.copy_default_translations(domain_name)
     return if @gettext_disabled || !gettext_loaded?
 

data/vendored/puppet/lib/puppet/indirector/catalog/compiler.rb

@@ -49,14 +49,12 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     node = node_from_request(facts, request)
     node.trusted_data = Puppet.lookup(:trusted_information) { Puppet::Context::TrustedInformation.local(node) }.to_h
 
-    node.environment.use_text_domain if node.environment
-
-    if catalog = compile(node, request.options)
-      return catalog
+    if node.environment
+      node.environment.with_text_domain do
+        compile(node, request.options)
+      end
     else
-      # This shouldn't actually happen; we should either return
-      # a config or raise an exception.
-      return nil
+      compile(node, request.options)
     end
   end
 

data/vendored/puppet/lib/puppet/indirector/rest.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'puppet/util/json'
+require 'puppet/util/connection'
 require 'semantic_puppet'
 
 require 'puppet/network/http'
@@ -39,66 +40,16 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     @srv_service || :puppet
   end
 
-  # The logic for server and port is kind of gross. In summary:
-  # IF an endpoint-specific setting is requested AND that setting has been set by the user
-  #    Use that setting.
-  #         The defaults for these settings are the "normal" server/masterport settings, so
-  #         when they are unset we instead want to "fall back" to the failover-selected
-  #         host/port pair.
-  # ELSE IF we have a failover-selected host/port
-  #    Use what the failover logic came up with
-  # ELSE IF the server_list setting is in use
-  #    Use the first entry - failover hasn't happened yet, but that
-  #    setting is still authoritative
-  # ELSE
-  #    Go for the legacy server/masterport settings, and hope for the best
+  # Select the server to use based on the settings configuration
+  # for this indirection, taking into account the HA server list.
   def self.server
-    setting = server_setting()
-    if setting && setting != :server && Puppet.settings.set_by_config?(setting)
-      Puppet.settings[setting]
-    else
-      server = Puppet.lookup(:server) do
-        if primary_server = Puppet.settings[:server_list][0]
-          Puppet.debug "Dynamically-bound server lookup failed; using first entry"
-          primary_server[0]
-        else
-          setting ||= :server
-          Puppet.debug "Dynamically-bound server lookup failed, falling back to #{setting} setting"
-          Puppet.settings[setting]
-        end
-      end
-      server
-    end
+    Puppet::Util::Connection.determine_server(server_setting)
   end
 
-  # For port there's a little bit of an extra snag: setting a specific
-  # server setting and relying on the default port for that server is
-  # common, so we also want to check if the assocaited SERVER setting
-  # has been set by the user. If either of those are set we ignore the
-  # failover-selected port.
+  # Select the port to use based on the settings configuration
+  # for this indirection, taking into account the HA server list.
   def self.port
-    setting = port_setting()
-    srv_setting = server_setting()
-    if (setting && setting != :masterport && Puppet.settings.set_by_config?(setting)) ||
-       (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
-      Puppet.settings[setting].to_i
-    else
-      port = Puppet.lookup(:serverport) do
-        if primary_server = Puppet.settings[:server_list][0]
-          Puppet.debug "Dynamically-bound port lookup failed; using first entry"
-
-          # Port might not be set, so we want to fallback in that
-          # case. We know we don't need to use `setting` here, since
-          # the default value of every port setting is `masterport`
-          (primary_server[1] || Puppet.settings[:masterport])
-        else
-          setting ||= :masterport
-          Puppet.debug "Dynamically-bound port lookup failed; falling back to #{setting} setting"
-          Puppet.settings[setting]
-        end
-      end
-      port.to_i
-    end
+    Puppet::Util::Connection.determine_port(port_setting, server_setting)
   end
 
   # Provide appropriate headers.

data/vendored/puppet/lib/puppet/indirector/terminus.rb

@@ -112,7 +112,7 @@ class Puppet::Indirector::Terminus
     # Return all terminus classes for a given indirection.
     def terminus_classes(indirection_name)
       setup_instance_loading indirection_name
-      instance_loader(indirection_name).files_to_load.map do |file|
+      instance_loader(indirection_name).files_to_load(Puppet.lookup(:current_environment)).map do |file|
         File.basename(file).chomp(".rb").intern
       end
     end