puppet 4.4.0 → 4.5.0

data/CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # How to contribute
 
-Third-party patches are essential for keeping puppet great. We simply can't
+Third-party patches are essential for keeping Puppet great. We simply can't
 access the huge number of platforms and myriad configurations for running
-puppet. We want to keep it as easy as possible to contribute changes that
+Puppet. We want to keep it as easy as possible to contribute changes that
 get things working in your environment. There are a few guidelines that we
 need contributors to follow so that we can have a chance of keeping on
 top of things.
@@ -90,7 +90,7 @@ a ticket number.
 
 ## Submitting Changes
 
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
+* Sign the [Contributor License Agreement](http://links.puppet.com/cla).
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to the repository in the puppetlabs organization.
 * Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
@@ -106,9 +106,9 @@ a ticket number.
 
 # Additional Resources
 
-* [Puppet Labs community guidelines](https://docs.puppetlabs.com/community/community_guidelines.html)
+* [Puppet community guidelines](https://docs.puppet.com/community/community_guidelines.html)
 * [Bug tracker (Jira)](https://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppetlabs.com/cla)
+* [Contributor License Agreement](http://links.puppet.com/cla)
 * [General GitHub documentation](https://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 * #puppet-dev IRC channel on freenode.org ([Archive](https://botbot.me/freenode/puppet-dev/))

data/Gemfile

@@ -46,11 +46,11 @@ group(:development, :test) do
   gem "multi_json", "1.7.7", :require => false, :platforms => [:ruby, :jruby]
   gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
 
-  gem "rubocop", "~> 0.26.1", :platforms => [:ruby]
+  gem "rubocop", "~> 0.39.0", :platforms => [:ruby]
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
 
-  gem 'webmock'
+  gem 'webmock', '~> 1.24'
   gem 'vcr', '~> 2.9'
 end
 

data/LICENSE

@@ -1,8 +1,8 @@
    Puppet - Automating Configuration Management.
 
-   Copyright (C) 2005-2015 Puppet Labs Inc
+   Copyright (C) 2005-2016 Puppet, Inc.
 
-   Puppet Labs can be contacted at: info@puppetlabs.com
+   Puppet, Inc. can be contacted at: info@puppet.com
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -73,3 +73,8 @@ 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/conf/puppet.conf

@@ -3,4 +3,4 @@
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
 # - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
-# - https://docs.puppetlabs.com/references/latest/configuration.html
+# - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html

data/ext/project_data.yaml

@@ -14,6 +14,8 @@ gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
+gem_required_ruby_version: '>= 1.9.3'
+gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
   hiera: ['>= 2.0', '< 4']

data/ext/redhat/puppet.spec.erb

@@ -181,12 +181,6 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 # Create puppet modules directory for puppet module tool
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
-# Install a NetworkManager dispatcher script to pickup changes to
-# # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
-mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
-cp -pr ext/puppet-nm-dispatcher \
-  %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
-
 # Masterhttp.log is created on server start and should be distributed
 # with correct permissions
 touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
@@ -197,9 +191,6 @@ touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
 %{_bindir}/puppet
 %{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 %if 0%{?_with_systemd}
 %{_unitdir}/puppet.service
 %{_unitdir}/puppetagent.service

data/ext/upload_facts.rb

@@ -58,7 +58,7 @@ is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.

data/lib/hiera_puppet.rb

@@ -67,21 +67,13 @@ module HieraPuppet
   end
 
   def hiera_config_file
-    config_file = nil
-
-    if Puppet.settings[:hiera_config].is_a?(String)
-      expanded_config_file = File.expand_path(Puppet.settings[:hiera_config])
-      if Puppet::FileSystem.exist?(expanded_config_file)
-        config_file = expanded_config_file
-      end
-    elsif Puppet.settings[:confdir].is_a?(String)
-      expanded_config_file = File.expand_path(File.join(Puppet.settings[:confdir], '/hiera.yaml'))
-      if Puppet::FileSystem.exist?(expanded_config_file)
-        config_file = expanded_config_file
-      end
+    hiera_config = Puppet.settings[:hiera_config]
+    if Puppet::FileSystem.exist?(hiera_config)
+      hiera_config
+    else
+      Puppet.warning "Config file #{hiera_config} not found, using Hiera defaults"
+      nil
     end
-
-    config_file
   end
 end
 

data/lib/puppet/application/agent.rb

@@ -155,7 +155,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet agent with '--genconfig'.
 
@@ -263,8 +263,8 @@ generated by running puppet agent with '--genconfig'.
 
 * --test:
   Enable the most common options used for testing. These are 'onetime',
-  'verbose', 'ignorecache', 'no-daemonize', 'no-usecacheonfailure',
-  'detailed-exitcodes', 'no-splay', and 'show_diff'.
+  'verbose', 'no-daemonize', 'no-usecacheonfailure', 'detailed-exitcodes',
+  'no-splay', and 'show_diff'.
 
 * --verbose:
   Turn on verbose reporting.
@@ -373,7 +373,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   # Enable all of the most common test options.
   def setup_test
-    Puppet.settings.handlearg("--ignorecache")
     Puppet.settings.handlearg("--no-usecacheonfailure")
     Puppet.settings.handlearg("--no-splay")
     Puppet.settings.handlearg("--show_diff")

data/lib/puppet/application/apply.rb

@@ -74,7 +74,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/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/application/ca.rb

@@ -6,5 +6,6 @@ class Puppet::Application::Ca < Puppet::Application::FaceBase
 
   def setup
     Puppet::SSL::Oids.register_puppet_oids
+    super
   end
 end

data/lib/puppet/application/cert.rb

@@ -164,7 +164,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet cert with
 '--genconfig'.

data/lib/puppet/application/filebucket.rb

@@ -73,7 +73,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/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/application/inspect.rb

@@ -48,7 +48,7 @@ OPTIONS
 Any configuration setting which is valid in the configuration file is
 also a valid long argument, e.g. '--server=master.domain.com'. See the
 configuration file documentation at
-https://docs.puppetlabs.com/references/latest/configuration.html for
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
 the full list of acceptable settings.
 
 * --archive_files:
@@ -91,7 +91,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     set_log_level
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
-    Puppet::Resource::Catalog.indirection.terminus_class = :yaml
+    Puppet::Resource::Catalog.indirection.terminus_class = Puppet[:catalog_cache_terminus] || :json
   end
 
   def preinit

data/lib/puppet/application/lookup.rb

@@ -6,7 +6,7 @@ require 'puppet/parser/compiler'
 class Puppet::Application::Lookup < Puppet::Application
 
   RUN_HELP = "Run 'puppet lookup --help' for more details".freeze
-  DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, --unpack-arrays, and --merge-hash-arrays'.freeze
+  DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'.freeze
 
   run_mode :master
 
@@ -35,10 +35,6 @@ class Puppet::Application::Lookup < Puppet::Application
 
   option('--sort-merge-arrays')
 
-  option('--unpack-arrays') do |arg|
-    options[:unpack_arrays] = arg
-  end
-
   option('--merge-hash-arrays')
 
   option('--explain')
@@ -124,7 +120,7 @@ USAGE
 -----
 puppet lookup [--help] [--type <TYPESTRING>] [--merge unique|hash|deep]
   [--knock-out-prefix <PREFIX-STRING>] [--sort-merged-arrays]
-  [--unpack-arrays <STRING-VALUE>] [--merge-hash-arrays] [--explain]
+  [--merge-hash-arrays] [--explain]
   [--default <VALUE>] [--node <NODE-NAME>] [--facts <FILE>]
   [--compile]
   [--render-as s|json|yaml|binary|msgpack] <keys>
@@ -164,19 +160,15 @@ the puppet lookup function linked to above.
   removed. 'deep' Performs a deep merge on values of Array and Hash type. There
   are additional option flags that can be used with 'deep'.
 
-* --knock_out_prefix <PREFIX-STRING>
+* --knock-out-prefix <PREFIX-STRING>
   Can be used with the 'deep' merge strategy. Specify string value to signify
   prefix which deletes elements from existing element.
 
-* --sort_merged_arrays
+* --sort-merged-arrays
   Can be used with the 'deep' merge strategy. When this flag is used all
   merged arrays will be sorted.
 
-* --unpack_arrays <STRING-VALUE>
-  Can be used with the 'deep' merge strategy. Specify a string value used
-  as a deliminator to join all array values and then split them again.
-
-* --merge_hash_arrays
+* --merge-hash-arrays
   Can be used with the 'deep' merge strategy. When this flag is used arrays
   and hashes will be merged.
 
@@ -225,7 +217,7 @@ EXAMPLE
   If you wanted to get the first value found for 'key_name_one' and 'key_name_two'
   within the scope of the agent.local node while merging values and knocking out
   the prefix 'foo' while merging, you would call lookup like this:
-  $ puppet lookup --node agent.local --merge deep --knock_out_prefix foo key_name_one key_name_two
+  $ puppet lookup --node agent.local --merge deep --knock-out-prefix foo key_name_one key_name_two
 
   If you wanted to lookup 'key_name' within the scope of the agent.local node,
   and return a default value of 'bar' if nothing was found, you would call
@@ -251,7 +243,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
     #  raise "No node was given via the '--node' flag for the scope of the lookup.\n#{RUN_HELP}"
     #end
 
-    if (options[:sort_merge_arrays] || options[:merge_hash_arrays] || options[:prefix] || options[:unpack_arrays]) && options[:merge] != 'deep'
+    if (options[:sort_merge_arrays] || options[:merge_hash_arrays] || options[:prefix]) && options[:merge] != 'deep'
       raise "The options #{DEEP_MERGE_OPTIONS} are only available with '--merge deep'\n#{RUN_HELP}"
     end
 
@@ -272,11 +264,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
           'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
 
         if options[:prefix]
-          merge_options.merge({'prefix' => options[:prefix]})
-        end
-
-        if options[:unpack_arrays]
-          merge_options.merge({'unpack_arrays' => options[:unpack_arrays]})
+          merge_options.merge!({'knockout_prefix' => options[:prefix]})
         end
 
       else

data/lib/puppet/application/master.rb

@@ -61,7 +61,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet master with '--genconfig'.
 

data/lib/puppet/application/resource.rb

@@ -72,7 +72,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/puppet/latest/reference/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'.
@@ -84,10 +84,6 @@ configuration options can also be generated by running puppet with
   Write the results of the query to a file, open the file in an editor,
   and read the file back in as an executable Puppet manifest.
 
-* --host:
-  When specified, connect to the resource server on the named host
-  and retrieve the list of resouces of the type specified.
-
 * --help:
   Print this help message.
 

data/lib/puppet/data_providers/hiera_config.rb

@@ -1,10 +1,10 @@
 require 'pathname'
-require_relative 'hiera_interpolate'
+require 'puppet/pops/lookup/interpolation'
 
 module Puppet::DataProviders
   class HieraConfig
     include Puppet::Plugins::DataProviders
-    include HieraInterpolate
+    include Puppet::Pops::Lookup::Interpolation
 
     DEFAULT_CONFIG = {
       'version' => 4,
@@ -27,8 +27,6 @@ module Puppet::DataProviders
         Hash[struct.map { |k,v| [k.to_s, symkeys_to_string(v)] }]
       when Array
         struct.map { |v| symkeys_to_string(v) }
-      when nil
-        {}
       else
         struct
       end

data/lib/puppet/data_providers/hiera_interpolate.rb

@@ -1,112 +1,19 @@
-require_relative 'hiera_config'
-
-# Add support for Hiera-like interpolation expressions. The expressions may contain keys that uses dot-notation
-# to further navigate into hashes and arrays
-#
+# @deprecated Moved to Puppet::Pops::Lookup::Interpolation
 module Puppet::DataProviders::HieraInterpolate
-  def interpolate(subject, lookup_invocation, allow_methods)
-    case subject
-    when String
-      subject.index('%{').nil? ? subject : interpolate_string(subject, lookup_invocation, allow_methods)
-    when Array
-      subject.map { |element| interpolate(element, lookup_invocation, allow_methods) }
-    when Hash
-      Hash[subject.map { |k, v| [k, interpolate(v, lookup_invocation, allow_methods)] }]
-    else
-      subject
-    end
-  end
-
-  private
-
-  def interpolate_string(subject, lookup_invocation, allow_methods)
-    lookup_invocation.with(:interpolate, subject) do
-      subject.gsub(/%\{([^\}]*)\}/) do |match|
-        expr = $1
-        # Leading and trailing spaces inside an interpolation expression are insignificant
-        expr.strip!
-        unless expr.empty? || expr == '::'
-          method_key, key = get_method_and_data(expr, allow_methods)
-          is_alias = method_key == 'alias'
-
-          # Alias is only permitted if the entire string is equal to the interpolate expression
-          raise Puppet::DataBinding::LookupError, "'alias' interpolation is only permitted if the expression is equal to the entire string" if is_alias && subject != match
-
-          segments = key.split('.')
-          value = interpolate_method(method_key).call(segments[0], lookup_invocation)
-          value = qualified_lookup(segments.drop(1), value) if segments.size > 1
-          value = lookup_invocation.check(key) { interpolate(value, lookup_invocation, allow_methods) }
-
-          # break gsub and return value immediately if this was an alias substitution. The value might be something other than a String
-          return value if is_alias
-        end
-        value || ''
-      end
-    end
-  end
-
-  def interpolate_method(method_key)
-    @@interpolate_methods ||= begin
-      global_lookup = lambda { |key, lookup_invocation| Puppet::Pops::Lookup.lookup(key, nil, '', true, nil, lookup_invocation) }
-      scope_lookup = lambda do |key, lookup_invocation|
-        lookup_invocation.with(:scope, nil) do
-          ovr = lookup_invocation.override_values
-          if ovr.include?(key)
-            lookup_invocation.report_found_in_overrides(key, ovr[key])
-          else
-            scope = lookup_invocation.scope
-            if scope.include?(key)
-              lookup_invocation.report_found(key, scope[key])
-            else
-              defaults = lookup_invocation.default_values
-              if defaults.include?(key)
-                lookup_invocation.report_found_in_defaults(key, defaults[key])
-              else
-                nil
-              end
-            end
-          end
-        end
-      end
-
-
-      {
-        'lookup' => global_lookup,
-        'hiera' => global_lookup, # this is just an alias for 'lookup'
-        'alias' => global_lookup, # same as 'lookup' but expression must be entire string. The result that is not subject to string substitution
-        'scope' => scope_lookup,
-        'literal' => lambda { |key, _| key }
-      }
-    end
-    interpolate_method = @@interpolate_methods[method_key]
-    raise Puppet::DataBinding::LookupError, "Unknown interpolation method '#{method_key}'" unless interpolate_method
-    interpolate_method
-  end
+  include Puppet::Pops::Lookup::Interpolation
 
+  # For backward compatibility
+  # @deprecated
   def qualified_lookup(segments, value)
-    segments.each do |segment|
-      throw :no_such_key if value.nil?
-      if segment =~ /^[0-9]+$/
-        segment = segment.to_i
-        raise Puppet::DataBinding::LookupError, "Data provider type mismatch: Got #{value.class.name} when Array was expected to enable lookup using key '#{segment}'" unless value.instance_of?(Array)
-        throw :no_such_key unless segment < value.size
-      else
-        raise Puppet::DataBinding::LookupError, "Data provider type mismatch: Got #{value.class.name} when a non Array object that responds to '[]' was expected to enable lookup using key '#{segment}'" unless value.respond_to?(:'[]') && !value.instance_of?(Array)
-        throw :no_such_key unless value.include?(segment)
+    if Puppet[:strict] != :off
+      msg = 'Puppet::DataProviders::HieraInterpolate#qualified_lookup is deprecated, use Puppet::Pops::Lookup::SubLookup#sub_lookup'
+      case Puppet[:strict]
+      when :error
+        raise Puppet::DataBinding::LookupError.new(msg)
+      when :warning
+        Puppet.warn_once(:deprecation, 'HieraInterpolate#qualified_lookup', msg)
       end
-      value = value[segment]
-    end
-    value
-  end
-
-  def get_method_and_data(data, allow_methods)
-    if match = data.match(/^(\w+)\((?:["]([^"]+)["]|[']([^']+)['])\)$/)
-      raise Puppet::DataBinding::LoookupError, 'Interpolation using method syntax is not allowed in this context' unless allow_methods
-      key = match[1]
-      data = match[2] || match[3] # double or single qouted
-    else
-      key = 'scope'
     end
-    [key, data]
+    sub_lookup('<unknown key>', Puppet::Pops::Lookup::Invocation.new(nil), segments, value)
   end
 end

data/lib/puppet/data_providers/json_data_provider_factory.rb

@@ -1,7 +1,6 @@
 # This file is loaded by the autoloader, and it does not find the data function support unless required relative
 #
 require 'json'
-require_relative 'hiera_interpolate'
 
 module Puppet::DataProviders
   class JsonDataProviderFactory < Puppet::Plugins::DataProviders::FileBasedDataProviderFactory
@@ -15,17 +14,11 @@ module Puppet::DataProviders
   end
 
   class JsonDataProvider < Puppet::Plugins::DataProviders::PathBasedDataProvider
-    include HieraInterpolate
-
     def initialize_data(path, lookup_invocation)
-      JSON.parse(File.read(path))
+      JSON.parse(Puppet::FileSystem.read(path, :encoding => 'utf-8'))
     rescue JSON::ParserError => ex
       # Filename not included in message, so we add it here.
       raise Puppet::DataBinding::LookupError, "Unable to parse (#{path}): #{ex.message}"
     end
-
-    def post_process(value, lookup_invocation)
-      interpolate(value, lookup_invocation, true)
-    end
   end
 end

data/lib/puppet/data_providers/yaml_data_provider_factory.rb

@@ -1,7 +1,6 @@
 # This file is loaded by the autoloader, and it does not find the data function support unless required relative
 #
 require 'yaml'
-require_relative 'hiera_interpolate'
 
 module Puppet::DataProviders
   class YamlDataProviderFactory < Puppet::Plugins::DataProviders::FileBasedDataProviderFactory
@@ -15,18 +14,13 @@ module Puppet::DataProviders
   end
 
   class YamlDataProvider < Puppet::Plugins::DataProviders::PathBasedDataProvider
-    include HieraInterpolate
-
     def initialize_data(path, lookup_invocation)
-      HieraConfig.symkeys_to_string(YAML.load_file(path))
+      data = YAML.load_file(path)
+      HieraConfig.symkeys_to_string(data.nil? ? {} : data)
     rescue YAML::SyntaxError => ex
       # Psych errors includes the absolute path to the file, so no need to add that
       # to the message
       raise Puppet::DataBinding::LookupError, "Unable to parse #{ex.message}"
     end
-
-    def post_process(value, lookup_invocation)
-      interpolate(value, lookup_invocation, true)
-    end
   end
 end