puppet 4.7.1 → 4.8.0

data/Gemfile

@@ -53,9 +53,6 @@ group(:development, :test) do
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
 
-  # webmock requires addressable as as of 2.5.0 addressable started
-  # requiring the public_suffix gem which requires Ruby 2
-  gem 'addressable', '< 2.5.0'
   gem 'webmock', '~> 1.24'
   gem 'vcr', '~> 2.9'
 end

data/MAINTAINERS

@@ -0,0 +1,76 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
+  "issues": "https://tickets.puppet.com/browse/PUP",
+  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-puppet-maintainers",
+  "people": [
+    {
+      "github": "hlindberg",
+      "email": "henrik.lindberg@puppet.com",
+      "name": "Henrik Lindberg"
+    },
+    {
+      "github": "kylog",
+      "email": "kylo@puppet.com",
+      "name": "Kylo Ginsberg"
+    },
+    {
+      "github": "joshcooper",
+      "email": "josh@puppet.com",
+      "name": "Josh Cooper"
+    },
+    {
+      "github": "MikaelSmith",
+      "email": "michael.smith@puppet.com",
+      "name": "Michael Smith"
+    },
+    {
+      "github": "thallgren",
+      "email": "thomas.hallgren@puppet.com",
+      "name": "Thomas Hallgren"
+    },
+    {
+      "github": "branan",
+      "email": "branan@puppet.com",
+      "name": "Branan Riley"
+    },
+    {
+      "github": "whopper",
+      "email": "whopper@puppet.com",
+      "name": "Will Hopper"
+    },
+    {
+      "github": "Iristyle",
+      "name": "Ethan J. Brown"
+    },
+    {
+      "github": "HAIL9000",
+      "email": "hailee@puppet.com",
+      "name": "Hailee Kenney"
+    },
+    {
+      "github": "er0ck",
+      "email": "eric.thompson@puppet.com",
+      "name": "Eric Thompson"
+    },
+    {
+      "github": "johnduarte",
+      "email": "john.duarte@puppet.com",
+      "name": "John Duarte"
+    },
+    {
+      "github": "adrienthebo",
+      "name": "Adrien Thebo"
+    },
+    {
+      "github": "jtappa",
+      "email": "jorie@puppet.com",
+      "name": "Jorie Tappa"
+    },
+    {
+      "github": "MosesMendoza",
+      "email": "moses@puppet.com",
+      "name": "Moses Mendoza"
+    }
+  ]
+}

data/README.md

@@ -72,9 +72,3 @@ Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
 [Puppet Enterprise Support Lifecycle](https://puppetlabs.com/misc/puppet-enterprise-lifecycle)
-
-Maintainers
--------
-
-* Kylo Ginsberg, kylo@puppet.com, github:kylog, jira:kylo
-* Henrik Lindberg, henrik.lindberg@puppet.com, github:hlindberg, jira:henrik.lindberg

data/Rakefile

@@ -83,8 +83,8 @@ task(:commits) do
   # populated with the range of commits the PR contains. If not available, this
   # falls back to `master..HEAD` as a next best bet as `master` is unlikely to
   # ever be absent.
-  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE'].sub(/\.\.\./, '..')
-  puts "Checking commits #{commit_range}"
+  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE']
+  puts "Checking commits..."
   %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
     # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
     # The exception tries to explain it in more full.

data/lib/puppet/agent.rb

@@ -39,7 +39,7 @@ class Puppet::Agent
     block_run = Puppet::Application.controlled_run do
       splay client_options.fetch :splay, Puppet[:splay]
       result = run_in_fork(should_fork) do
-        with_client do |client|
+        with_client(client_options[:transaction_uuid]) do |client|
           begin
             client_args = client_options.merge(:pluginsync => Puppet::Configurer.should_pluginsync?)
             lock { client.run(client_args) }
@@ -88,9 +88,9 @@ class Puppet::Agent
 
   # Create and yield a client instance, keeping a reference
   # to it during the yield.
-  def with_client
+  def with_client(transaction_uuid)
     begin
-      @client = client_class.new
+      @client = client_class.new(Puppet::Configurer::DownloaderFactory.new, transaction_uuid)
     rescue StandardError => detail
       Puppet.log_exception(detail, "Could not create instance of #{client_class}: #{detail}")
       return

data/lib/puppet/application/apply.rb

@@ -328,7 +328,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     set_log_level
 
     if Puppet[:profile]
-      @profiler = Puppet::Util::Profiler.add_profiler(Puppet::Util::Profiler::Aggregate.new(Puppet.method(:debug), "apply"))
+      @profiler = Puppet::Util::Profiler.add_profiler(Puppet::Util::Profiler::Aggregate.new(Puppet.method(:info), "apply"))
     end
   end
 

data/lib/puppet/configurer.rb

@@ -56,12 +56,12 @@ class Puppet::Configurer
     end
   end
 
-  def initialize(factory = Puppet::Configurer::DownloaderFactory.new)
+  def initialize(factory = Puppet::Configurer::DownloaderFactory.new, transaction_uuid = nil)
     @running = false
     @splayed = false
     @cached_catalog_status = 'not_used'
     @environment = Puppet[:environment]
-    @transaction_uuid = SecureRandom.uuid
+    @transaction_uuid = transaction_uuid || SecureRandom.uuid
     @static_catalog = true
     @checksum_type = Puppet[:supported_checksum_types]
     @handler = Puppet::Configurer::PluginHandler.new(factory)

data/lib/puppet/data_providers.rb

@@ -1,3 +1,4 @@
+# @api private
 module Puppet::DataProviders
 
   def self.assert_loaded

data/lib/puppet/data_providers/data_adapter.rb

@@ -1,5 +1,6 @@
 # A DataAdapter adapts an object with a Hash of data
 #
+# @api private
 class Puppet::DataProviders::DataAdapter < Puppet::Pops::Adaptable::Adapter
   include Puppet::Plugins::DataProviders
 

data/lib/puppet/data_providers/data_function_support.rb

@@ -1,3 +1,4 @@
+# @api private
 module Puppet::DataProviders::DataFunctionSupport
   def initialize_data(data_key, lookup_invocation)
     name = "#{data_key}::data"

data/lib/puppet/data_providers/function_env_data_provider.rb

@@ -8,6 +8,7 @@ module Puppet::DataProviders; end
 # The function is called on demand, and is associated with the compiler via an Adapter. This ensures that the data
 # is only produced once per compilation.
 #
+# @api private
 class Puppet::DataProviders::FunctionEnvDataProvider < Puppet::Plugins::DataProviders::EnvironmentDataProvider
   include Puppet::DataProviders::DataFunctionSupport
 

data/lib/puppet/data_providers/function_module_data_provider.rb

@@ -8,6 +8,7 @@ module Puppet::DataProviders; end
 # The function is called on demand, and is associated with the compiler via an Adapter. This ensures that the data
 # is only produced once per compilation.
 #
+# @api private
 class Puppet::DataProviders::FunctionModuleDataProvider < Puppet::Plugins::DataProviders::ModuleDataProvider
   include Puppet::DataProviders::DataFunctionSupport
 

data/lib/puppet/data_providers/hiera_config.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'puppet/pops/lookup/interpolation'
 
 module Puppet::DataProviders
+  # @api private
   class HieraConfig
     include Puppet::Plugins::DataProviders
     include Puppet::Pops::Lookup::Interpolation

data/lib/puppet/data_providers/hiera_env_data_provider.rb

@@ -2,6 +2,7 @@
 require_relative 'hiera_support'
 
 module Puppet::DataProviders
+  # @api private
   class HieraEnvDataProvider < Puppet::Plugins::DataProviders::EnvironmentDataProvider
     include HieraSupport
 

data/lib/puppet/data_providers/hiera_interpolate.rb

@@ -3,6 +3,7 @@ module Puppet::DataProviders::HieraInterpolate
   include Puppet::Pops::Lookup::Interpolation
 
   # For backward compatibility
+  # @api private
   # @deprecated
   def qualified_lookup(segments, value)
     if Puppet[:strict] != :off

data/lib/puppet/data_providers/hiera_module_data_provider.rb

@@ -2,6 +2,7 @@
 require_relative 'hiera_support'
 
 module Puppet::DataProviders
+  # @api private
   class HieraModuleDataProvider < Puppet::Plugins::DataProviders::ModuleDataProvider
     include HieraSupport
 

data/lib/puppet/data_providers/hiera_support.rb

@@ -1,5 +1,6 @@
 require_relative 'hiera_config'
 
+# @api private
 module Puppet::DataProviders::HieraSupport
   def config_path
     @hiera_config.nil? ? 'not yet configured' : @hiera_config.config_path
@@ -15,8 +16,6 @@ module Puppet::DataProviders::HieraSupport
   # @param key [String] The key to lookup
   # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
   # @param merge [Puppet::Pops::MergeStrategy,String,Hash<String,Object>,nil] Merge strategy or hash with strategy and options
-  #
-  # @api public
   def unchecked_lookup(key, lookup_invocation, merge)
     lookup_invocation.with(:data_provider, self) do
       merge_strategy = Puppet::Pops::MergeStrategy.strategy(merge)

data/lib/puppet/data_providers/json_data_provider_factory.rb

@@ -3,6 +3,7 @@
 require 'json'
 
 module Puppet::DataProviders
+  # @api private
   class JsonDataProviderFactory < Puppet::Plugins::DataProviders::FileBasedDataProviderFactory
     def create(name, paths, parent_data_provider)
       JsonDataProvider.new(name, paths, parent_data_provider)
@@ -13,6 +14,7 @@ module Puppet::DataProviders
     end
   end
 
+  # @api private
   class JsonDataProvider < Puppet::Plugins::DataProviders::PathBasedDataProvider
     def initialize_data(path, lookup_invocation)
       JSON.parse(Puppet::FileSystem.read(path, :encoding => 'utf-8'))

data/lib/puppet/data_providers/yaml_data_provider_factory.rb

@@ -3,6 +3,7 @@
 require 'yaml'
 
 module Puppet::DataProviders
+  # @api private
   class YamlDataProviderFactory < Puppet::Plugins::DataProviders::FileBasedDataProviderFactory
     def create(name, paths, parent_data_provider)
       YamlDataProvider.new(name, paths, parent_data_provider)
@@ -13,6 +14,7 @@ module Puppet::DataProviders
     end
   end
 
+  # @api private
   class YamlDataProvider < Puppet::Plugins::DataProviders::PathBasedDataProvider
     def initialize_data(path, lookup_invocation)
       data = YAML.load_file(path)

data/lib/puppet/defaults.rb

@@ -616,7 +616,7 @@ deprecated and has been replaced by 'always_retry_plugins'."
 
   Puppet.define_settings(:module_tool,
     :module_repository  => {
-      :default  => 'https://forgeapi.puppetlabs.com',
+      :default  => 'https://forgeapi.puppet.com',
       :desc     => "The module repository",
     },
     :module_working_dir => {
@@ -1926,4 +1926,23 @@ EOT
           generate manifest documentation.",
     }
   )
+
+  define_settings(
+    :main,
+    :rich_data => {
+      :default  => false,
+      :type     => :boolean,
+      :hook    => proc do |value|
+        envs = Puppet.lookup(:environments) { nil }
+        envs.clear_all unless envs.nil?
+      end,
+      :desc     => <<-'EOT'
+        Enables having extended data in the catalog by adding the key `ext_parameters` to serialized
+        resources. When enabled, resource containing values of the data types `Binary`, `Regexp`,
+        `SemVer`, `SemVerRange`, `Timespan` and `Timestamp`, as well as instances of types derived
+        from `Object` retain their data type and are serialized using Pcore in `ext_parameters`.
+      EOT
+    }
+  )
+
 end

data/lib/puppet/environments.rb

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

data/lib/puppet/face/catalog.rb

@@ -123,7 +123,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
 
       Puppet::Resource::Catalog.indirection.terminus_class = :yaml
       Puppet::Face[:catalog, "0.0.1"].save(catalog)
-      Puppet.notice "Saved catalog for #{Puppet[:certname]} to yaml"
+      Puppet.notice "Saved catalog for #{Puppet[:certname]} to #{Puppet::Resource::Catalog.indirection.terminus.path(Puppet[:certname])}"
       nil
     end
   end

data/lib/puppet/face/epp.rb

@@ -62,6 +62,8 @@ Puppet::Face.define(:epp, '0.0.1') do
     EOT
     when_invoked do |*args|
       options = args.pop
+      # pass a dummy node, as facts are not needed for validation
+      options[:node] = node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
       compiler = create_compiler(options)
 
       status = true # no validation error yet
@@ -141,6 +143,8 @@ Puppet::Face.define(:epp, '0.0.1') do
     when_invoked do |*args|
       require 'puppet/pops'
       options = args.pop
+      # pass a dummy node, as facts are not needed for dump
+      options[:node] = node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
       options[:header] = options[:header].nil? ? true : options[:header]
       options[:validate] = options[:validate].nil? ? true : options[:validate]
 
@@ -224,8 +228,12 @@ Puppet::Face.define(:epp, '0.0.1') do
       showing the name of the template before the output. The header output can be turned off with
       `--no-header`. This also concatenates the template results without any added newline separators.
 
-      Facts for the simulated node can be feed to the rendering process by referencing a .yaml file
-      with facts using the --facts option. (Values can be obtained in yaml format directly from
+      Facts from the node where the command is being run are used by default.args Facts can be obtained
+      for other nodes if they have called in, and reported their facts by using the `--node <nodename>`
+      flag.
+
+      Overriding node facts as well as additional facts can be given in a .yaml or .json file and referencing
+      it with the --facts option. (Values can be obtained in yaml format directly from
       `facter`, or from puppet for a given node). Note that it is not possible to simulate the
       reserved variable name `$facts` in any other way.
 
@@ -278,6 +286,10 @@ Puppet::Face.define(:epp, '0.0.1') do
           $ puppet epp render -e '<% $facts[osfamily] %>' --facts data.yaml
     EOT
 
+    option("--node <node_name>") do
+      summary "The name of the node for which facts are obtained. Defaults to facts for the local node."
+    end
+
     option "--e <source>" do
       default_to { nil }
       summary "Render one inline epp template given on the command line."
@@ -291,8 +303,8 @@ Puppet::Face.define(:epp, '0.0.1') do
       summary "A .pp or .yaml file that is processed to produce a hash of values for the template."
     end
 
-    option("--facts <yaml_file>") do
-      summary "A .yaml file containing a hash of facts made available in $facts"
+    option("--facts <facts_file>") do
+      summary "A .yaml or .json file containing a hash of facts made available in $facts and $trusted"
     end
 
     option("--[no-]header") do
@@ -444,16 +456,50 @@ Puppet::Face.define(:epp, '0.0.1') do
 
   # @api private
   def create_compiler(options)
-    fact_values = options[:facts] ? YAML.load_file(options[:facts]) : {}
-    node = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", fact_values))
+    if options[:node]
+      node = options[:node]
+    else
+      node = Puppet[:node_name_value]
+
+      # If we want to lookup the node we are currently on
+      # we must returning these settings to their default values
+      Puppet.settings[:facts_terminus] = 'facter'
+      Puppet.settings[:node_cache_terminus] = nil
+    end
+
+    unless node.is_a?(Puppet::Node)
+      node = Puppet::Node.indirection.find(node)
+      # Found node must be given the environment to use in some cases, use the one configured
+      # or given on the command line
+      node.environment = Puppet[:environment]
+    end
+
+    fact_file = options[:facts]
+
+    if fact_file
+      if fact_file.is_a?(Hash) # when used via the Face API
+        given_facts = fact_file
+      elsif fact_file.end_with?("json")
+        given_facts = JSON.parse(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+      else
+        given_facts = YAML.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+      end
+
+      unless given_facts.instance_of?(Hash)
+        raise "Incorrect formatted data in #{fact_file} given via the --facts flag"
+      end
+      # It is difficult to add to or modify the set of facts once the node is created
+      # as changes does not show up in parameters. Rather than manually patching up
+      # a node and risking future regressions, a new node is created from scratch
+      node = Puppet::Node.new(node.name, :facts => Puppet::Node::Facts.new("facts", node.facts.values.merge(given_facts)))
+      node.environment = Puppet[:environment]
+      node.merge(node.facts.values)
+    end
+
     compiler = Puppet::Parser::Compiler.new(node)
     # configure compiler with facts and node related data
     # Set all global variables from facts
-    fact_values.each {|param, value| compiler.topscope[param] = value }
-    # Configured trusted data (even if there are none)
-    compiler.topscope.set_trusted(node.trusted_data)
-    # Set the facts hash
-    compiler.topscope.set_facts(fact_values)
+    compiler.send(:set_node_parameters)
 
     # pretend that the main class (named '') has been evaluated
     # since it is otherwise not possible to resolve top scope variables