puppet 3.8.6 → 3.8.7

data/ext/build_defaults.yaml

@@ -26,8 +26,8 @@ build_msi:
     repo: 'git://github.com/puppetlabs/hiera.git'
   sys:
     ref:
-      x86: 'refs/tags/1.9.3-p551.9'
-      x64: 'refs/tags/2.0.0.12-x64'
+      x86: 'refs/tags/1.9.3-p551.10'
+      x64: 'refs/tags/2.0.0.13-x64'
     repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'

data/ext/nagios/check_puppet.rb

@@ -27,17 +27,17 @@ class CheckPuppet
         o.on(
           "-s", "--statefile=statefile", String, "The state file",
 
-    "Default: #{OPTIONS[:statefile]}") { |OPTIONS[:statefile]| }
+    "Default: #{OPTIONS[:statefile]}") { |op| OPTIONS[:statefile] = op }
 
       o.on(
         "-p", "--process=processname", String, "The process to check",
 
-    "Default: #{OPTIONS[:process]}")   { |OPTIONS[:process]| }
+    "Default: #{OPTIONS[:process]}")   { |op| OPTIONS[:process] = op }
 
       o.on(
         "-i", "--interval=value", Integer,
 
-    "Default: #{OPTIONS[:interval]} minutes")  { |OPTIONS[:interval]| }
+    "Default: #{OPTIONS[:interval]} minutes")  { |op| OPTIONS[:interval] = op }
 
     o.separator ""
     o.on_tail("-h", "--help", "Show this help message.") do

data/ext/redhat/puppet.spec.erb

@@ -181,22 +181,12 @@ 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}
-
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE README.md examples
 %{_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/systemd/puppet.service

@@ -7,6 +7,7 @@ After=basic.target network.target puppetmaster.service
 EnvironmentFile=-/etc/sysconfig/puppetagent
 EnvironmentFile=-/etc/sysconfig/puppet
 ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 
 [Install]

data/lib/puppet/module_tool/tar/mini.rb

@@ -31,7 +31,7 @@ class Puppet::ModuleTool::Tar::Mini
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
       if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
-        entry.name
+        entry.full_name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"
         next

data/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -304,6 +304,15 @@ module Puppet::Pops::Evaluator::Runtime3Support
     # a proper Issue. Now the result is "Error while evaluating a Resource Statement" with the message
     # from the raised exception. (It may be good enough).
 
+
+    # In 3.x scope does not resolve classes as absolute names.
+    # In 4.x it does. This comment, and the conditional logic in the if below
+    # should be removed when merged to 4.x
+    #
+    if type_name == CLASS_STRING
+      resource_titles = resource_titles.map {|s| s.index('::') != 0 ? "::#{s}" : s }
+    end
+
     # resolve in scope.
     fully_qualified_type, resource_titles = scope.resolve_type_and_titles(type_name, resource_titles)
 

data/lib/puppet/pops/issues.rb

@@ -73,19 +73,30 @@ module Puppet::Pops::Issues
       instance_eval &block
     end
 
-    # Returns the label provider given as a key in the hash passed to #format.
-    # If given an argument, calls #label on the label provider (caller would otherwise have to
-    # call label.label(it)
+    # Obtains the label provider given as a key `:label` in the hash passed to #format. The label provider is
+    # return if no arguments are given. If given an argument, returns the result of calling #label on the label
+    # provider.
     #
-    def label(it = nil)
-      raise "Label provider key :label must be set to produce the text of the message!" unless @data[:label]
-      it.nil? ? @data[:label] : @data[:label].label(it)
+    # @param args [Object] one object to obtain a label for or zero arguments to obtain the label provider
+    # @return [Puppet::Pops::LabelProvider,String] the label provider or label depending on if an argument is given or not
+    # @raise [Puppet::Error] if no label provider is found
+    def label(*args)
+      args.empty? ? label_provider : label_provider.label(args[0])
+    end
+
+    # Returns the label provider given as key `:label` in the hash passed to #format.
+    # @return [Puppet::Pops::LabelProvider] the label provider
+    # @raise [Puppet::Error] if no label provider is found
+    def label_provider
+      label_provider = @data[:label]
+      raise Puppet::Error, 'Label provider key :label must be set to produce the text of the message!' unless label_provider
+      label_provider
     end
 
     # Returns the label provider given as a key in the hash passed to #format.
     #
     def semantic
-      raise "Label provider key :semantic must be set to produce the text of the message!" unless @data[:semantic]
+      raise Puppet::Error, 'Label provider key :semantic must be set to produce the text of the message!' unless @data[:semantic]
       @data[:semantic]
     end
   end

data/lib/puppet/pops/types/type_calculator.rb

@@ -886,6 +886,8 @@ class Puppet::Pops::Types::TypeCalculator
     case o
     when :default
       Types::PDefaultType.new()
+    when :undef
+      Types::PUndefType.new()
     else
       infer_Object(o)
     end

data/lib/puppet/provider/service/launchd.rb

@@ -206,7 +206,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   def self.read_plist(path)
     begin
       return Plist::parse_xml(path)
-    rescue ArgumentError => detail
+    rescue ArgumentError, NoMethodError => detail
       Puppet.debug("Error reading #{path}: #{detail}. Retrying with plutil.")
     end
 

data/lib/puppet/provider/user/user_role_add.rb

@@ -167,10 +167,12 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def password
-    shadow_entry[1] if shadow_entry
+    return :absent unless shadow_entry
+    shadow_entry[1]
   end
 
   def password_min_age
+    return :absent unless shadow_entry
     shadow_entry[3].empty? ? -1 : shadow_entry[3]
   end
 

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.8.6'
+  PUPPETVERSION = '3.8.7'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/module_tool/tar/mini_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'puppet/module_tool'
+require 'puppet_spec/files'
+
+describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? && Puppet.features.zlib?) do
+  let(:minitar)    { described_class.new }
+
+  describe "Extracts tars with long and short pathnames" do
+    let (:sourcetar) { File.expand_path('../../../../fixtures/module.tar.gz', __FILE__) }
+
+    let (:longfilepath)  { "puppetlabs-dsc-1.0.0/lib/puppet_x/dsc_resources/xWebAdministration/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.schema.mof" }
+    let (:shortfilepath) { "puppetlabs-dsc-1.0.0/README.md" }
+
+    it "unpacks a tar with a short path length" do
+      extractdir = PuppetSpec::Files.tmpdir('minitar')
+
+      minitar.unpack(sourcetar,extractdir,'module')
+      expect(File).to exist(File.expand_path("#{extractdir}/#{shortfilepath}"))
+    end
+
+    it "unpacks a tar with a long path length" do
+      extractdir = PuppetSpec::Files.tmpdir('minitar')
+
+      minitar.unpack(sourcetar,extractdir,'module')
+      expect(File).to exist(File.expand_path("#{extractdir}/#{longfilepath}"))
+    end
+  end
+end

data/spec/integration/parser/dynamic_scoping_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+require 'puppet/pops'
+require 'puppet/parser/parser_factory'
+require 'puppet_spec/compiler'
+require 'puppet_spec/pops'
+require 'puppet_spec/scope'
+require 'matchers/resource'
+require 'rgen/metamodel_builder'
+
+# These tests are in a separate file since othr compiler related tests have
+# been dramatically changed between 3.x and 4.x and it is a pain to merge
+# them.
+#
+describe "Puppet::Parser::Compiler when dealing with relative naming" do
+  include PuppetSpec::Compiler
+  include Matchers::Resource
+
+  describe "the compiler when using 4.x parser and evaluator" do
+    # this before-clause should be removed when merging to 4.x
+    before :each do
+      Puppet[:parser] = 'future'
+    end
+
+    it "should use absolute references even if references are not anchored" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::thing {
+        notify {"from foo::thing":}
+      }
+
+      class thing {
+        notify {"from ::thing":}
+      }
+
+      class foo {
+      #  include thing
+        class {'thing':}
+      }
+
+      include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from ::thing]")
+    end
+
+    it "should use absolute references when references are absolute" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::thing {
+        notify {"from foo::thing":}
+      }
+
+      class thing {
+        notify {"from ::thing":}
+      }
+
+      class foo {
+      #  include thing
+        class {'::thing':}
+      }
+
+      include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from ::thing]")
+    end
+  end
+
+  # This entire describe should be removed when merged to 4.x
+  #
+  describe "the compiler when using 3.x parser and evaluator" do
+    # this before-clause should be removed when merging to 4.x
+    before :each do
+      Puppet[:parser] = 'current'
+    end
+
+    it "should use relative references when they are not anchored" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+            class foo::thing {
+              notify {"from foo::thing":}
+            }
+
+            class thing {
+              notify {"from ::thing":}
+            }
+
+            class foo {
+            #  include thing
+              class {'thing':}
+            }
+
+            include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from foo::thing]")
+    end
+
+    it "should use absolute references when references are absolute" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::thing {
+        notify {"from foo::thing":}
+      }
+
+      class thing {
+        notify {"from ::thing":}
+      }
+
+      class foo {
+      #  include thing
+        class {'::thing':}
+      }
+
+      include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from ::thing]")
+    end
+
+  end # End 3.x only case
+
+end