puppet 4.5.3-x86-mingw32 → 4.6.1-x86-mingw32

data/lib/puppet/configurer/plugin_handler.rb

@@ -14,10 +14,8 @@ class Puppet::Configurer::PluginHandler
 
     result = []
 
-    if Puppet.features.external_facts?
-      plugin_fact_downloader = @factory.create_plugin_facts_downloader(environment)
-      result += plugin_fact_downloader.evaluate
-    end
+    plugin_fact_downloader = @factory.create_plugin_facts_downloader(environment)
+    result += plugin_fact_downloader.evaluate
 
     result += plugin_downloader.evaluate
     Puppet::Util::Autoload.reload_changed

data/lib/puppet/data_providers/hiera_config.rb

@@ -42,7 +42,7 @@ module Puppet::DataProviders
       hierarchy_elem_type_v2 = hierarchy_elem_type_base + ',paths=>Array[String[1]]}]'
       hierarchy_elem_type_v3 = hierarchy_elem_type_base + '}]'
 
-      Puppet::Pops::Types::TypeParser.new.parse('Struct[{'\
+      Puppet::Pops::Types::TypeParser.singleton.parse('Struct[{'\
         'version=>Integer[4],'\
         "hierarchy=>Optional[Array[Variant[#{hierarchy_elem_type_v1},#{hierarchy_elem_type_v2},#{hierarchy_elem_type_v3}]]],"\
         'datadir=>Optional[String[1]]}]')

data/lib/puppet/defaults.rb

@@ -112,7 +112,8 @@ module Puppet
         Valid values for this setting are:
 
         * `deprecations` --- disables deprecation warnings.
-        * `undefined_variables` --- disables warnings about non existing variables.",
+        * `undefined_variables` --- disables warnings about non existing variables.
+        * `undefined_resources` --- disables warnings about non existing resources.",
       :hook      => proc do |value|
         values = munge(value)
         valid   = %w[deprecations undefined_variables undefined_resources]
@@ -418,7 +419,7 @@ deprecated and has been replaced by 'always_retry_plugins'."
     :data_binding_terminus => {
       :type    => :terminus,
       :default => "hiera",
-      :desc    => "Where to retrive information about data.",
+      :desc    => "Where to retrieve information about data.",
     },
     :hiera_config => {
       :default => lambda do
@@ -639,7 +640,7 @@ deprecated and has been replaced by 'always_retry_plugins'."
     Puppet.define_settings(
     :main,
 
-    # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for
+    # We have to downcase the fqdn, because the current ssl stuff (as opposed to in master) doesn't have good facilities for
     # manipulating naming.
     :certname => {
       :default => lambda { Puppet::Settings.default_certname.downcase },
@@ -1073,7 +1074,7 @@ EOT
         this path as a directory if one exists or if the path ends with a / or \\.
 
         Setting a global value for `manifest` in puppet.conf is not allowed
-        (but it can be overridden from them commandline). Please use
+        (but it can be overridden from the commandline). Please use
         directory environments instead. If you need to use something other than the
         environment's `manifests` directory as the main manifest, you can set
         `manifest` in environment.conf. For more info, see
@@ -1226,7 +1227,7 @@ EOT
       field for authorization.
 
       Note that the name of the HTTP header gets munged by the web server
-      common gateway inteface: an `HTTP_` prefix is added, dashes are converted
+      common gateway interface: an `HTTP_` prefix is added, dashes are converted
       to underscores, and all letters are uppercased.  Thus, to use the
       `X-Client-DN` header, this setting should be `HTTP_X_CLIENT_DN`.",
     },
@@ -1237,7 +1238,7 @@ EOT
       client successfully authenticated, and anything else otherwise.
 
       Note that the name of the HTTP header gets munged by the web server
-      common gateway inteface: an `HTTP_` prefix is added, dashes are converted
+      common gateway interface: an `HTTP_` prefix is added, dashes are converted
       to underscores, and all letters are uppercased.  Thus, to use the
       `X-Client-Verify` header, this setting should be
       `HTTP_X_CLIENT_VERIFY`.",
@@ -1347,6 +1348,14 @@ EOT
         this file reflects the state discovered through interacting
         with clients."
       },
+    :transactionstorefile => {
+      :default => "$statedir/transactionstore.yaml",
+      :type => :file,
+      :mode => "0660",
+      :desc => "Transactional storage file for persisting data between
+        transactions for the purposes of infering information (such as
+        corrective_change) on new data received."
+    },
     :clientyamldir => {
       :default => "$vardir/client_yaml",
       :type => :directory,
@@ -1395,7 +1404,25 @@ EOT
     },
     :server => {
       :default => "puppet",
-      :desc => "The puppet master server to which the puppet agent should connect."
+      :desc => "The puppet master server to which the puppet agent should connect.",
+      :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)
+        end
+      }
+    },
+    :server_list => {
+      :default => [],
+      :type => :server_list,
+      :desc => "The list of puppet master servers to which the puppet agent should connect,
+        in the order that they will be tried.",
+      :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)
+        end
+      }
     },
     :use_srv_records => {
       :default    => false,

data/lib/puppet/environments.rb

@@ -147,8 +147,10 @@ module Puppet::Environments
     include EnvironmentLoader
 
     def initialize(environment_dir, global_module_path)
-      @environment_dir = environment_dir
-      @global_module_path = global_module_path
+      @environment_dir =  Puppet::FileSystem.expand_path(environment_dir)
+      @global_module_path = global_module_path ?
+        global_module_path.map { |p| Puppet::FileSystem.expand_path(p) } :
+        nil
     end
 
     # Generate an array of directory loaders from a path string.

data/lib/puppet/error.rb

@@ -93,7 +93,7 @@ module Puppet
   class MissingCommand < Puppet::Error
   end
 
-  # Raised when we failed to aquire a lock
+  # Raised when we failed to acquire a lock
   class LockError < Puppet::Error
   end
 

data/lib/puppet/external/dot.rb

@@ -8,7 +8,7 @@
 
 module DOT
 
-  # These glogal vars are used to make nice graph source.
+  # These global vars are used to make nice graph source.
 
   $tab  = '    '
   $tab2 = $tab * 2

data/lib/puppet/face/ca.rb

@@ -178,7 +178,10 @@ Puppet::Face.define(:ca, '0.1.0') do
       Puppet::SSL::Host.ca_location = :only
 
       begin
-        ca.sign(host, options[:allow_dns_alt_names])
+        signing_options = options.select { |k,_|
+          [:allow_dns_alt_names, :allow_authorization_extensions].include?(k)
+        }
+        ca.sign(host, signing_options)
       rescue ArgumentError => e
         if e.to_s =~ /Could not find certificate request/
           e.to_s

data/lib/puppet/face/certificate.rb

@@ -77,6 +77,10 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
       # them. Otherwise, they will default to the config file setting iff this
       # cert is for the host we're running on.
 
+      unless Puppet::FileSystem.exist?(Puppet[:hostcert])
+        Puppet.push_context({:ssl_host => host})
+      end
+
       host.generate_certificate_request(:dns_alt_names => options[:dns_alt_names])
     end
   end
@@ -129,7 +133,9 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
           raise ArgumentError, "This process is not configured as a certificate authority"
         end
 
-        ca.sign(name, options[:allow_dns_alt_names])
+        signing_options = {allow_dns_alt_names: options[:allow_dns_alt_names]}
+
+        ca.sign(name, signing_options)
       end
     end
   end

data/lib/puppet/face/epp.rb

@@ -72,7 +72,7 @@ Puppet::Face.define(:epp, '0.0.1') do
           status &&= tmp
         else
           # This is not an error since a validate of all files in an empty
-          # directry should not be treated as a failed validation.
+          # directory should not be treated as a failed validation.
           Puppet.notice "No template specified. No action taken"
         end
       end
@@ -115,10 +115,10 @@ Puppet::Face.define(:epp, '0.0.1') do
       If no arguments are given, the stdin is read (unless it is attached to a terminal)
 
       If multiple templates are given, they are separated with a header indicating the
-      name of the template. This can be surpressed with the option --no-header.
-      The option --[no-]header has no effect whe a single template is dumped.
+      name of the template. This can be suppressed with the option --no-header.
+      The option --[no-]header has no effect when a single template is dumped.
 
-      When debugging the epp parser itself, it may be useful to surpress the valiation
+      When debugging the epp parser itself, it may be useful to suppress the validation
       step with the `--no-validate` option to observe what the parser produced from the
       given source.
 
@@ -238,7 +238,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
       When designing EPP templates, it is strongly recommended to define all template arguments
       in the template, and to give them in a hash when calling `epp` or `inline_epp` and to use
-      as few global variables as possible, preferrably only the $facts hash. This makes templates
+      as few global variables as possible, preferably only the $facts hash. This makes templates
       more free standing and are easier to reuse, and to test.
     EOT
 

data/lib/puppet/face/generate.rb

@@ -0,0 +1,64 @@
+require 'puppet/face'
+require 'puppet/generate/type'
+
+# Create the Generate face
+Puppet::Face.define(:generate, '0.1.0') do
+  copyright 'Puppet Inc.', 2016
+  license   'Apache 2 license; see COPYING'
+
+  summary 'Generates Puppet code from Ruby definitions.'
+
+  action(:types) do
+    summary 'Generates Puppet code for custom types'
+
+    description <<-'EOT'
+      Generates definitions for custom resource types using Puppet code.
+
+      Types defined in Puppet code can be used to isolate custom type definitions
+      between different environments.
+    EOT
+
+    examples <<-'EOT'
+      Generate Puppet type definitions for all custom resource types in the current environment:
+
+          $ puppet generate types
+
+      Generate Puppet type definitions for all custom resource types in the specified environment:
+
+          $ puppet generate types --environment development
+    EOT
+
+    option '--format <format>' do
+      summary 'The generation output format to use. Supported formats: pcore.'
+      default_to { 'pcore' }
+
+      before_action do |_, _, options|
+        raise ArgumentError, "'#{options[:format]}' is not a supported format for type generation." unless ['pcore'].include?(options[:format])
+      end
+    end
+
+    option '--force' do
+      summary 'Forces the generation of output files (skips up-to-date checks).'
+      default_to { false }
+    end
+
+    when_invoked do |options|
+      generator = Puppet::Generate::Type
+      inputs = generator.find_inputs(options[:format].to_sym)
+      environment = Puppet.lookup(:current_environment)
+
+      # get the common output directory (in <envroot>/.resource_types) - create it if it does not exists
+      # error if it exists and is not a directory
+      #
+      path_to_env = environment.configuration.path_to_env
+      outputdir = File.join(path_to_env, '.resource_types')
+      if Puppet::FileSystem.exist?(outputdir) && !Puppet::FileSystem.directory?(outputdir)
+        raise ArgumentError, "The output directory '#{outputdir}' exists and is not a directory"
+      end
+      Puppet::FileSystem::mkpath(outputdir)
+
+      generator.generate(inputs, outputdir, options[:force])
+      nil
+    end
+  end
+end

data/lib/puppet/face/help.rb

@@ -77,25 +77,31 @@ Puppet::Face.define(:help, '0.0.1') do
 
   def render_application_help(applicationname)
     return Puppet::Application[applicationname].help
+  rescue StandardError, LoadError => detail
+    msg = <<-MSG
+Could not load help for the application #{applicationname}.
+Please check the error logs for more information.
+
+Detail: "#{detail.message}"
+MSG
+    fail ArgumentError, msg, detail.backtrace
   end
 
   def render_face_help(facename, actionname, version)
     face, action = load_face_help(facename, actionname, version)
     return template_for(face, action).result(binding)
-  end
-
-  def load_face_help(facename, actionname, version)
-    begin
-      face = Puppet::Face[facename.to_sym, version]
-    rescue Puppet::Error => detail
-      msg = <<-MSG
+  rescue StandardError, LoadError => detail
+    msg = <<-MSG
 Could not load help for the face #{facename}.
 Please check the error logs for more information.
 
 Detail: "#{detail.message}"
-      MSG
-      fail ArgumentError, msg, detail.backtrace
-    end
+MSG
+    fail ArgumentError, msg, detail.backtrace
+  end
+
+  def load_face_help(facename, actionname, version)
+    face = Puppet::Face[facename.to_sym, version]
     if actionname
       action = face.get_action(actionname.to_sym)
       if not action
@@ -141,7 +147,7 @@ Detail: "#{detail.message}"
         begin
           face = Puppet::Face[appname, :current]
           result << [appname, face.summary]
-        rescue Puppet::Error
+        rescue StandardError, LoadError
           result << [ "! #{appname}", "! Subcommand unavailable due to error. Check error logs." ]
         end
       else
@@ -162,8 +168,8 @@ Detail: "#{detail.message}"
           return md[1]
         end
       end
-    rescue StandardError
-      result << [ "! #{appname}", "! Subcommand unavailable due to error. Check error logs." ]
+    rescue StandardError, LoadError
+      return "! Subcommand unavailable due to error. Check error logs."
     end
     return ''
   end

data/lib/puppet/face/man.rb

@@ -12,7 +12,7 @@ Puppet::Face.define(:man, '0.0.1') do
   description <<-EOT
     This subcommand displays manual pages for all Puppet subcommands. If the
     `ronn` gem (<https://github.com/rtomayko/ronn/>) is installed on your
-    system, puppet man will display fully-formated man pages. If `ronn` is not
+    system, puppet man will display fully-formatted man pages. If `ronn` is not
     available, puppet man will display the raw (but human-readable) source text
     in a pager.
   EOT

data/lib/puppet/feature/external_facts.rb

@@ -1,5 +1,5 @@
 require 'facter'
 
 Puppet.features.add(:external_facts) {
-  Facter.respond_to?(:search_external)
+  true
 }

data/lib/puppet/file_system.rb

@@ -1,4 +1,5 @@
 module Puppet::FileSystem
+  require 'puppet/util'
   require 'puppet/file_system/path_pattern'
   require 'puppet/file_system/file_impl'
   require 'puppet/file_system/memory_file'
@@ -329,6 +330,21 @@ module Puppet::FileSystem
     @impl.pathname(path)
   end
 
+  # Produces a string representation of the opaque path handle, with expansions
+  # performed on ~.  For Windows, this means that C:\Users\Admini~1\AppData will
+  # be expanded to C:\Users\Administrator\AppData.  On POSIX filesystems, the
+  # value ~ will be expanded to something like /Users/Foo
+  #
+  # This method exists primarlily to resolve a Ruby deficiency where
+  # File.expand_path doesn't handle ~ in each segment on a Windows path
+  #
+  # @param path [Object] a path handle produced by {#pathname}
+  # @return [String] a string representation of the path
+  #
+  def self.expand_path(path, dir_string = nil)
+    @impl.expand_path(path, dir_string)
+  end
+
   # Asserts that the given path is of the expected type produced by #pathname
   #
   # @raise [ArgumentError] when path is not of the expected type

data/lib/puppet/file_system/file_impl.rb

@@ -22,6 +22,11 @@ class Puppet::FileSystem::FileImpl
     path.to_s
   end
 
+  def expand_path(path, dir_string = nil)
+    # ensure `nil` values behave like underlying File.expand_path
+    ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
+  end
+
   def open(path, mode, options, &block)
     ::File.open(path, options, mode, &block)
   end

data/lib/puppet/file_system/memory_impl.rb

@@ -3,6 +3,10 @@ class Puppet::FileSystem::MemoryImpl
     @files = files + all_children_of(files)
   end
 
+  def expand_path(path, dir_string = nil)
+    File.expand_path(path, dir_string)
+  end
+
   def exist?(path)
     path.exist?
   end

data/lib/puppet/file_system/path_pattern.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'puppet/error'
 
 module Puppet::FileSystem
   class PathPattern

data/lib/puppet/file_system/windows.rb

@@ -3,6 +3,25 @@ require 'puppet/util/windows'
 
 class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
 
+  def expand_path(path, dir_string = nil)
+    # ensure `nil` values behave like underlying File.expand_path
+    string_path = ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
+    # if no tildes, nothing to expand, no need to call Windows API, return original string
+    return string_path if !string_path.index('~')
+
+    begin
+      # no need to do existence check up front as GetLongPathName implies that check is performed
+      # and it should be the exception that files aren't actually present
+      string_path = Puppet::Util::Windows::File.get_long_pathname(string_path)
+    rescue Puppet::Util::Windows::Error => e
+      # preserve original File.expand_path behavior for file / path not found by returning string
+      raise if (e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
+        e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND)
+    end
+
+    string_path
+  end
+
   def exist?(path)
     return Puppet::Util::Windows::File.exist?(path)
   end