puppet 4.3.0 → 4.4.0

data/lib/puppet/data_providers/lookup_adapter.rb

@@ -3,7 +3,9 @@
 #
 class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
 
-  LOOKUP_OPTIONS = 'lookup_options'.freeze
+  LOOKUP_OPTIONS = Puppet::Pops::Lookup::LOOKUP_OPTIONS
+  LOOKUP_OPTIONS_PREFIX = LOOKUP_OPTIONS + '.'
+  LOOKUP_OPTIONS_PREFIX.freeze
   HASH = 'hash'.freeze
   MERGE = 'merge'.freeze
 
@@ -29,12 +31,43 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
   # @throws :no_such_key if the given key is not found
   #
   def lookup(key, lookup_invocation, merge)
-    merge = lookup_merge_options(key, lookup_invocation) if merge.nil?
-    merge_strategy = Puppet::Pops::MergeStrategy.strategy(merge)
-    lookup_invocation.with(:merge, merge_strategy) do
-      result = merge_strategy.merge_lookup([:lookup_global, :lookup_in_environment, :lookup_in_module]) { |m| send(m, key, lookup_invocation, merge_strategy) }
-      lookup_invocation.report_result(result)
-      result
+    # The 'lookup_options' key is reserved and not found as normal data
+    if key == LOOKUP_OPTIONS || key.start_with?(LOOKUP_OPTIONS_PREFIX)
+      lookup_invocation.with(:invalid_key, LOOKUP_OPTIONS) do
+        throw :no_such_key
+      end
+    end
+
+    lookup_invocation.top_key ||= key
+    merge_explained = false
+    if lookup_invocation.explain_options?
+      catch(:no_such_key) do
+        module_name = extract_module_name(key) unless key == Puppet::Pops::Lookup::GLOBAL
+        lookup_invocation.module_name = module_name
+        if lookup_invocation.only_explain_options?
+          do_lookup(LOOKUP_OPTIONS, lookup_invocation, HASH)
+          return nil
+        end
+
+        # Bypass cache and do a "normal" lookup of the lookup_options
+        lookup_invocation.with(:meta, LOOKUP_OPTIONS) do
+          key_options = do_lookup(LOOKUP_OPTIONS, lookup_invocation, HASH)[key]
+          merge = key_options[MERGE] unless key_options.nil?
+          merge_explained = true
+        end
+      end
+    elsif merge.nil?
+      # Used cached lookup_options
+      merge = lookup_merge_options(key, lookup_invocation)
+      lookup_invocation.report_merge_source('lookup_options') unless merge.nil?
+    end
+
+    if merge_explained
+      # Merge lookup is explained in detail so we need to explain the data in a section
+      # on the same level to avoid confusion
+      lookup_invocation.with(:data, key) { do_lookup(key, lookup_invocation, merge) }
+    else
+      do_lookup(key, lookup_invocation, merge)
     end
   end
 
@@ -44,13 +77,15 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     lookup_invocation.with(:global, terminus) do
       catch(:no_such_key) do
         return lookup_invocation.report_found(name, Puppet::DataBinding.indirection.find(name,
-            { :environment => @env.to_s, :variables => lookup_invocation.scope, :merge => merge_strategy }))
+            { :environment => @env, :variables => lookup_invocation.scope, :merge => merge_strategy }))
       end
       lookup_invocation.report_not_found(name)
       throw :no_such_key
     end
-  rescue Puppet::DataBinding::LookupError => e
-    raise Puppet::Error.new("Error from DataBinding '#{terminus}' while looking up '#{name}': #{e.message}", e)
+  rescue Puppet::DataBinding::LookupError => detail
+    error = Puppet::Error.new("Lookup of key '#{lookup_invocation.top_key}' failed: #{detail.message}")
+    error.set_backtrace(detail.backtrace)
+    raise error
   end
 
   # @api private
@@ -60,7 +95,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
 
   # @api private
   def lookup_in_module(name, lookup_invocation, merge_strategy)
-    module_name = extract_module_name(name)
+    module_name = lookup_invocation.module_name || extract_module_name(name)
 
     # Do not attempt to do a lookup in a module unless the name is qualified.
     throw :no_such_key if module_name.nil?
@@ -95,41 +130,52 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     module_name = extract_module_name(name)
 
     # Retrieve the options for the module. We use nil as a key in case we have none
-    options = @lookup_options[module_name]
-    if options.nil? && !@lookup_options.include?(module_name)
+    if !@lookup_options.include?(module_name)
       options = retrieve_lookup_options(module_name, lookup_invocation, Puppet::Pops::MergeStrategy.strategy(HASH))
       raise Puppet::DataBinding::LookupError.new("value of #{LOOKUP_OPTIONS} must be a hash") unless options.nil? || options.is_a?(Hash)
       @lookup_options[module_name] = options
+    else
+      options = @lookup_options[module_name]
     end
     options.nil? ? nil : options[name]
   end
 
   private
 
+  def do_lookup(key, lookup_invocation, merge)
+    merge_strategy = Puppet::Pops::MergeStrategy.strategy(merge)
+    lookup_invocation.with(:merge, merge_strategy) do
+      result = merge_strategy.merge_lookup([:lookup_global, :lookup_in_environment, :lookup_in_module]) { |m| send(m, key, lookup_invocation, merge_strategy) }
+      lookup_invocation.report_result(result)
+      result
+    end
+  end
+
   # Retrieve lookup options that applies when using a specific module (i.e. a merge of the pre-cached
   # `env_lookup_options` and the module specific data)
   def retrieve_lookup_options(module_name, lookup_invocation, merge_strategy)
-    lookup_invocation.with(:meta, module_name) do
-      env_opts = env_lookup_options(lookup_invocation, merge_strategy)
-      options = nil
-      unless module_name.nil?
-        catch(:no_such_key) do
-          options = module_provider(module_name).lookup(LOOKUP_OPTIONS, lookup_invocation, merge_strategy)
-          options = merge_strategy.merge(env_opts, options) unless env_opts.nil?
-        end
+    meta_invocation = Puppet::Pops::Lookup::Invocation.new(lookup_invocation.scope)
+    meta_invocation.top_key = lookup_invocation.top_key
+    env_opts = env_lookup_options(meta_invocation, merge_strategy)
+    unless module_name.nil? || @env.module(module_name).nil?
+      catch(:no_such_key) do
+        meta_invocation.module_name = module_name
+        options = module_provider(module_name).lookup(LOOKUP_OPTIONS, meta_invocation, merge_strategy)
+        options = merge_strategy.merge(env_opts, options) unless env_opts.nil?
+        return options
       end
-      options.nil? ? env_opts : options
     end
+    env_opts
   end
 
   # Retrieve and cache lookup options specific to the environment that this adapter is attached to (i.e. a merge
   # of global and environment lookup options).
-  def env_lookup_options(lookup_invocation, merge_strategy)
-    unless instance_variable_defined?(:@env_lookup_options)
+  def env_lookup_options(meta_invocation, merge_strategy)
+    if !instance_variable_defined?(:@env_lookup_options)
       @env_lookup_options = nil
       catch(:no_such_key) do
         @env_lookup_options = merge_strategy.merge_lookup([:lookup_global, :lookup_in_environment]) do |m|
-          send(m, LOOKUP_OPTIONS, lookup_invocation, merge_strategy)
+          send(m, LOOKUP_OPTIONS, meta_invocation, merge_strategy)
         end
       end
     end
@@ -170,7 +216,8 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     unless provider
       raise Puppet::Error.new("Environment '#{@env.name}', cannot find module_data_provider '#{provider_name}'")
     end
-    provider
+    # Provider is configured per module but cached using environment life cycle so it must be cloned
+    provider.clone
   end
 
   def initialize_env_provider

data/lib/puppet/data_providers/yaml_data_provider_factory.rb

@@ -5,8 +5,8 @@ require_relative 'hiera_interpolate'
 
 module Puppet::DataProviders
   class YamlDataProviderFactory < Puppet::Plugins::DataProviders::FileBasedDataProviderFactory
-    def create(name, paths)
-      YamlDataProvider.new(name, paths)
+    def create(name, paths, parent_data_provider)
+      YamlDataProvider.new(name, paths, parent_data_provider)
     end
 
     def path_extension

data/lib/puppet/defaults.rb

@@ -111,10 +111,11 @@ module Puppet
 
         Valid values for this setting are:
 
-        * `deprecations` --- disables deprecation warnings.",
+        * `deprecations` --- disables deprecation warnings.
+        * `undefined_variables` --- disables warnings about non existing variables.",
       :hook      => proc do |value|
         values = munge(value)
-        valid   = %w[deprecations]
+        valid   = %w[deprecations undefined_variables]
         invalid = values - (values & valid)
         if not invalid.empty?
           raise ArgumentError, "Cannot disable unrecognized warning types #{invalid.inspect}. Valid values are #{valid.inspect}."
@@ -147,6 +148,17 @@ module Puppet
         :type     => :boolean,
         :desc     => "Whether to enable experimental performance profiling",
     },
+    :static_catalogs => {
+      :default    => true,
+      :type       => :boolean,
+      :desc       => "Whether to compile a static catalog."
+    },
+    :strict_environment_mode => {
+      :default    => false,
+      :type       => :boolean,
+      :desc       => "Whether the agent specified environment should be considered authoritative,
+        causing the run to fail if the retrieved catalog does not match it.",
+    },
     :autoflush => {
       :default => true,
       :type       => :boolean,
@@ -233,11 +245,11 @@ module Puppet
           be set in `[master]`, `[agent]`, or an environment config section.",
         :call_hook => :on_define_and_write,
         :hook             => proc do |value|
-          ENV["PATH"] = "" if ENV["PATH"].nil?
-          ENV["PATH"] = value unless value == "none"
-          paths = ENV["PATH"].split(File::PATH_SEPARATOR)
+          Puppet::Util.set_env('PATH', '') if Puppet::Util.get_env('PATH').nil?
+          Puppet::Util.set_env('PATH', value) unless value == 'none'
+          paths = Puppet::Util.get_env('PATH').split(File::PATH_SEPARATOR)
           Puppet::Util::Platform.default_paths.each do |path|
-            ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
+            Puppet::Util.set_env('PATH', Puppet::Util.get_env('PATH') + File::PATH_SEPARATOR + path) unless paths.include?(path)
           end
           value
         end
@@ -272,7 +284,7 @@ module Puppet
 
         This setting must have a value set to enable **directory environments.** The
         recommended value is `$codedir/environments`. For more details, see
-        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
       :type    => :path,
     },
     :always_cache_features => {
@@ -484,9 +496,10 @@ module Puppet
     },
     :environment_data_provider => {
       :default    => "none",
-      :desc       => "The name of a registered environment data provider. The two built in
-      and registered providers are 'none' (no environment specific data), and 'function'
-      (environment specific data obtained by calling the function 'environment::data()').
+      :desc       => "The name of a registered environment data provider used when obtaining environment
+      specific data. The three built in and registered providers are 'none' (no data), 'function' (data
+      obtained by calling the function 'environment::data()') and 'hiera' (data obtained using a data
+      provider configured using a hiera.yaml file in root of the environment).
       Other environment data providers may be registered in modules on the module path. For such
       custom data providers see the respective module documentation."
     },
@@ -571,15 +584,15 @@ module Puppet
         `certname` setting as its requested Subject CN.
 
         This is the name used when managing a node's permissions in
-        [auth.conf](http://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
+        [auth.conf](https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
         In most cases, it is also used as the node's name when matching
-        [node definitions](http://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
+        [node definitions](https://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
         and requesting data from an ENC. (This can be changed with the `node_name_value`
         and `node_name_fact` settings, although you should only do so if you have
         a compelling reason.)
 
         A node's certname is available in Puppet manifests as `$trusted['certname']`. (See
-        [Facts and Built-In Variables](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
+        [Facts and Built-In Variables](https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
         for more details.)
 
         * For best compatibility, you should limit the value of `certname` to
@@ -780,6 +793,21 @@ EOT
         :values => ["md5", "sha256"],
         :desc     => 'Which digest algorithm to use for file resources and the filebucket.
                       Valid values are md5, sha256. Default is md5.',
+    },
+    :supported_checksum_types => {
+      :default => ['md5', 'sha256'],
+      :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.',
+      :hook    => proc do |value|
+        values = munge(value)
+        valid   = ['md5', 'md5lite', 'sha256', 'sha256lite', '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}."
+        end
+      end
     }
   )
 
@@ -895,7 +923,7 @@ EOT
         the request.
 
         For info on autosign configuration files, see
-        [the guide to Puppet's config files](http://docs.puppetlabs.com/guides/configuring.html).",
+        [the guide to Puppet's config files](http://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html).",
     },
     :allow_duplicate_certs => {
       :default    => false,
@@ -968,7 +996,7 @@ EOT
         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
-        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :modulepath => {
       :default => "",
@@ -982,7 +1010,7 @@ EOT
         directory environments instead. If you need to use something other than the
         default modulepath of `<ACTIVE ENVIRONMENT'S MODULES DIR>:$basemodulepath`,
         you can set `modulepath` in environment.conf. For more info, see
-        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :config_version => {
       :default    => "",
@@ -994,7 +1022,7 @@ EOT
       Setting a global value for config_version in puppet.conf is not allowed
       (but it can be overridden from the commandline). Please set a
       per-environment value in environment.conf instead. For more info, see
-      http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+      https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     }
   )
 
@@ -1106,7 +1134,7 @@ EOT
         These are the modules that will be used by _all_ environments. Note that
         the `modules` directory of the active environment will have priority over
         any global directories. For more info, see
-        http://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
     },
     :ssl_client_header => {
       :default    => "HTTP_X_CLIENT_DN",
@@ -1282,7 +1310,7 @@ EOT
         For control over logging destinations, see the `--logdest` command line
         option in the manual pages for puppet master, puppet agent, and puppet
         apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
-        or read them online at http://docs.puppetlabs.com/references/latest/man/."
+        or read them online at https://docs.puppetlabs.com/references/latest/man/."
     },
     :server => {
       :default => "puppet",
@@ -1327,7 +1355,7 @@ EOT
         event _would_ have been sent.
 
         **Important note:**
-        [The `noop` metaparameter](http://docs.puppetlabs.com/references/latest/metaparameter.html#noop)
+        [The `noop` metaparameter](https://docs.puppetlabs.com/references/latest/metaparameter.html#noop)
         allows you to apply individual resources in noop mode, and will override
         the global value of the `noop` setting. This means a resource with
         `noop => false` _will_ be changed if necessary, even when running puppet
@@ -1412,7 +1440,16 @@ EOT
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether to sleep for a pseudo-random (but consistent) amount of time before
-        a run.",
+        a run.
+
+        For example, without `splay` enabled, your agent checks in every 30
+        minutes at :01 and :31 past the hour. After enabling `splay`, the agent
+        will wait the pseudorandom sleep time, say eight minutes, and then check
+        in every 30 minutes, at :09 and :39 after the hour. If you restart the
+        same agent at 12:45 PM, it will wait its eight minutes, and check in at
+        12:52 PM, and every 30 minutes after that, at 1:22 PM, 1:52 PM, and so
+        on. Other agents will have different sleep times, and so will check in
+        at different times even if they are all restarted at the same time.",
     },
     :clientbucketdir => {
       :default  => "$vardir/clientbucket",
@@ -1564,7 +1601,11 @@ EOT
     :pluginsync => {
       :default    => true,
       :type       => :boolean,
-      :desc       => "Whether plugins should be synced with the central server.",
+      :desc       => "Whether plugins should be synced with the central server. This setting is
+        deprecated.",
+      :hook => proc { |value|
+        Puppet.deprecation_warning "Setting 'pluginsync' is deprecated."
+      }
     },
 
     :pluginsignore => {
@@ -1600,6 +1641,12 @@ EOT
         only resources tagged with the specified tags will be applied.
         Values must be comma-separated.",
     },
+    :skip_tags => {
+      :default    => "",
+      :desc       => "Tags to use to filter resources.  If this is set, then
+        only resources not tagged with the specified tags will be applied.
+        Values must be comma-separated.",
+    },
     :evaltrace => {
       :default    => false,
       :type       => :boolean,

data/lib/puppet/environments.rb

@@ -40,6 +40,8 @@ module Puppet::Environments
     end
 
     def clear_all
+      root = Puppet.lookup(:root_environment) { nil }
+      root.instance_variable_set(:@static_catalogs, nil) unless root.nil?
     end
   end
 
@@ -110,7 +112,7 @@ module Puppet::Environments
     def get_conf(name)
       env = get(name)
       if env
-        Puppet::Settings::EnvironmentConf.static_for(env)
+        Puppet::Settings::EnvironmentConf.static_for(env, 0, Puppet[:static_catalogs])
       else
         nil
       end

data/lib/puppet/face/config.rb

@@ -9,7 +9,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
   description "This subcommand can inspect and modify settings from Puppet's
     'puppet.conf' configuration file. For documentation about individual settings,
-    see http://docs.puppetlabs.com/references/latest/configuration.html."
+    see https://docs.puppetlabs.com/references/latest/configuration.html."
 
   option "--section SECTION_NAME" do
     default_to { "main" }

data/lib/puppet/face/epp.rb

@@ -172,7 +172,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
         show_filename = templates.count > 1
         dumps = templates.each do |file|
-          buffer.print dump_parse(File.read(file), file, options, show_filename)
+          buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
         end
 
         if !missing_files.empty?

data/lib/puppet/face/help/man.erb

@@ -23,7 +23,7 @@ settings, so you can specify `--server <servername>`, or
 `--run_mode <runmode>` as an argument.
 
 See the configuration file documentation at
-<http://docs.puppetlabs.com/references/stable/configuration.html> for the
+<https://docs.puppetlabs.com/references/stable/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/lib/puppet/face/module/install.rb

@@ -21,7 +21,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo
       Preparing to install into /etc/puppetlabs/code/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -30,7 +30,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --environment development
       Preparing to install into /etc/puppetlabs/code/environments/development/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppetlabs/code/environments/development/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -39,7 +39,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo -v 0.0.4
       Preparing to install into /etc/puppetlabs/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -48,7 +48,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
       Preparing to install into /opt/puppetlabs/puppet/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -57,7 +57,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
       Preparing to install into /opt/puppetlabs/puppet/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
@@ -66,7 +66,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
       Preparing to install into /etc/puppetlabs/code/modules ...
-      Downloading from http://forgeapi.puppetlabs.com ...
+      Downloading from https://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)

data/lib/puppet/face/parser.rb

@@ -107,7 +107,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         missing_files = files - available_files
 
         dumps = available_files.collect do |file|
-          dump_parse(File.read(file), file, options)
+          dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options)
         end.join("")
 
         if missing_files.empty?
@@ -146,13 +146,16 @@ Puppet::Face.define(:parser, '0.0.1') do
   # @api private
   def validate_manifest(manifest = nil)
     env = Puppet.lookup(:current_environment)
-    validation_environment = manifest ? env.override_with(:manifest => manifest) : env
-
-    validation_environment.check_for_reparse
-    validation_environment.known_resource_types.clear
-
-  rescue => detail
-    Puppet.log_exception(detail)
-    exit(1)
+    loaders = Puppet::Pops::Loaders.new(env)
+    Puppet.override( {:loaders => loaders } , 'For puppet parser validate') do
+      begin
+        validation_environment = manifest ? env.override_with(:manifest => manifest) : env
+        validation_environment.check_for_reparse
+        validation_environment.known_resource_types.clear
+      rescue => detail
+        Puppet.log_exception(detail)
+        exit(1)
+      end
+    end
   end
 end

data/lib/puppet/face/status.rb

@@ -37,7 +37,8 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
     This action requires that the server's `auth.conf` file allow find
     access to the `status` REST terminus. Puppet agent does not use this
     facility, and it is turned off by default. See
-    <http://docs.puppetlabs.com/guides/rest_auth_conf.html> for more details.
+    <https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html>
+    for more details.
   EOT
   find.examples <<-'EOT'
     Check the status of the configured puppet master:

data/lib/puppet/feature/cfpropertylist.rb

@@ -0,0 +1,3 @@
+require 'puppet/util/feature'
+
+Puppet.features.add(:cfpropertylist, :libs => ['cfpropertylist'])

data/lib/puppet/feature/telnet.rb

@@ -0,0 +1,9 @@
+require 'puppet/util/feature'
+
+Puppet.features.add :telnet do
+  begin
+    require 'net/telnet'
+  rescue LoadError
+    false
+  end
+end

data/lib/puppet/file_serving/http_metadata.rb

@@ -0,0 +1,46 @@
+require 'puppet/file_serving/metadata'
+
+# Simplified metadata representation, suitable for the information
+# that is available from HTTP headers.
+class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
+
+  def initialize(http_response, path = '/dev/null')
+    super(path)
+
+    # ignore options that do not apply to HTTP metadata
+    @owner = @group = @mode = nil
+
+    # hash available checksums for eventual collection
+    @checksums = {}
+    # use a default mtime in case there is no usable HTTP header
+    @checksums[:mtime] = "{mtime}#{Time.now}"
+
+    if checksum = http_response['content-md5']
+      # convert base64 digest to hex
+      checksum = checksum.unpack("m0").first.unpack("H*").first
+      @checksums[:md5] = "{md5}#{checksum}"
+    end
+
+    if last_modified = http_response['last-modified']
+      mtime = DateTime.httpdate(last_modified).to_time
+      @checksums[:mtime] = "{mtime}#{mtime}"
+    end
+
+    @ftype = 'file'
+
+    self
+  end
+
+  # Override of the parent class method. Does not call super!
+  # We can only return metadata that was extracted from the
+  # HTTP headers during #initialize.
+  def collect
+    # Prefer the checksum_type from the indirector request options
+    # but fall back to the alternative otherwise
+    [ @checksum_type, :md5, :mtime ].each do |type|
+      @checksum_type = type
+      @checksum = @checksums[type]
+      return if @checksum
+    end
+  end
+end

data/lib/puppet/file_serving/metadata.rb

@@ -3,6 +3,7 @@ require 'puppet/indirector'
 require 'puppet/file_serving'
 require 'puppet/file_serving/base'
 require 'puppet/util/checksums'
+require 'uri'
 
 # A class that handles retrieving file metadata.
 class Puppet::FileServing::Metadata < Puppet::FileServing::Base
@@ -12,7 +13,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   extend Puppet::Indirector
   indirects :file_metadata, :terminus_class => :selector
 
-  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions
+  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions, :content_uri
 
   PARAM_ORDER = [:mode, :ftype, :owner, :group]
 
@@ -28,6 +29,18 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @source_permissions = source_permissions.intern
   end
 
+  def content_uri=(path)
+    begin
+      uri = URI.parse(URI.escape(path))
+    rescue URI::InvalidURIError => detail
+      raise(ArgumentError, "Could not understand URI #{path}: #{detail}")
+    end
+    raise(ArgumentError, "Cannot use opaque URLs '#{path}'") unless uri.hierarchical?
+    raise(ArgumentError, "Must use URLs of type puppet as content URI") if uri.scheme != "puppet"
+
+    @content_uri = path
+  end
+
   class MetaStat
     extend Forwardable
 
@@ -121,6 +134,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @checksum_type ||= Puppet[:digest_algorithm]
     @ftype       = data.delete('type')
     @destination = data.delete('destination')
+    @source      = data.delete('source')
+    @content_uri = data.delete('content_uri')
     super(path,data)
   end
 
@@ -136,7 +151,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
         },
         'type'         => ftype,
         'destination'  => destination,
-      }
+      }.merge(content_uri ? {'content_uri' => content_uri} : {})
+       .merge(source ? {'source' => source} : {})
     )
   end