puppet 3.7.5-x86-mingw32 → 3.8.1-x86-mingw32

data/lib/puppet/util/logging.rb

@@ -24,8 +24,44 @@ module Puppet::Util::Logging
   #    wish to log a message at all; in this case it is likely that you are only calling this method in order
   #    to take advantage of the backtrace logging.
   def log_exception(exception, message = :default, options = {})
-    err(format_exception(exception, message, Puppet[:trace] || options[:trace]))
+    trace = Puppet[:trace] || options[:trace]
+    if message == :default && exception.is_a?(Puppet::ParseErrorWithIssue)
+      # Retain all detailed info and keep plain message and stacktrace separate
+      backtrace = []
+      build_exception_trace(backtrace, exception, trace)
+      Puppet::Util::Log.create({
+          :level => :err,
+          :source => log_source,
+          :message => exception.basic_message,
+          :issue_code => exception.issue_code,
+          :backtrace => backtrace.empty? ? nil : backtrace,
+          :file => exception.file,
+          :line => exception.line,
+          :pos => exception.pos,
+          :environment => exception.environment,
+          :node => exception.node
+        }.merge(log_metadata))
+    else
+      err(format_exception(exception, message, trace))
+    end
+  end
+
+  def build_exception_trace(arr, exception, trace = true)
+    if trace and exception.backtrace
+      exception.backtrace.each do |line|
+        arr << line =~ /^(.+):(\d+.*)$/ ? ("#{Pathname($1).realpath}:#{$2}" rescue line) : line
+      end
+    end
+    if exception.respond_to?(:original)
+      original =  exception.original
+      unless original.nil?
+        arr << 'Wrapped exception:'
+        arr << original.message
+        build_exception_trace(arr, original, trace)
+      end
+    end
   end
+  private :build_exception_trace
 
   def format_exception(exception, message = :default, trace = true)
     arr = []

data/lib/puppet/util/windows/adsi.rb

@@ -15,7 +15,7 @@ module Puppet::Util::Windows::ADSI
     def connect(uri)
       begin
         WIN32OLE.connect(uri)
-      rescue Exception => e
+      rescue WIN32OLERuntimeError => e
         raise Puppet::Error.new( "ADSI connection error: #{e}", e )
       end
     end
@@ -161,7 +161,15 @@ module Puppet::Util::Windows::ADSI
     def commit
       begin
         native_user.SetInfo unless native_user.nil?
-      rescue Exception => e
+      rescue WIN32OLERuntimeError => e
+        # ERROR_BAD_USERNAME 2202L from winerror.h
+        if e.message =~ /8007089A/m
+          raise Puppet::Error.new(
+           "Puppet is not able to create/delete domain users with the user resource.",
+           e
+          )
+        end
+
         raise Puppet::Error.new( "User update failed: #{e}", e )
       end
       self
@@ -285,7 +293,7 @@ module Puppet::Util::Windows::ADSI
     def self.delete(sid)
       begin
         Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
-      rescue => e
+      rescue WIN32OLERuntimeError => e
         # http://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
         # Prior to Vista SP1, there's no builtin way to programmatically
         # delete user profiles (except for delprof.exe). So try to delete
@@ -328,7 +336,15 @@ module Puppet::Util::Windows::ADSI
     def commit
       begin
         native_group.SetInfo unless native_group.nil?
-      rescue Exception => e
+      rescue WIN32OLERuntimeError => e
+        # ERROR_BAD_USERNAME 2202L from winerror.h
+        if e.message =~ /8007089A/m
+          raise Puppet::Error.new(
+            "Puppet is not able to create/delete domain groups with the group resource.",
+            e
+          )
+        end
+
         raise Puppet::Error.new( "Group update failed: #{e}", e )
       end
       self
@@ -387,19 +403,28 @@ module Puppet::Util::Windows::ADSI
       sids
     end
 
-    def set_members(desired_members)
-      return if desired_members.nil? or desired_members.empty?
+    def set_members(desired_members, inclusive = true)
+      return if desired_members.nil?
 
       current_hash = Hash[ self.member_sids.map { |sid| [sid.to_s, sid] } ]
       desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members
-      members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
-      add_member_sids(*members_to_add)
+      if !desired_hash.empty?
+        members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
+        add_member_sids(*members_to_add)
+      end
+
+      # Then we remove all extra members if inclusive
+      if inclusive
+        if desired_hash.empty?
+          members_to_remove = current_hash.values
+        else
+          members_to_remove = (current_hash.keys - desired_hash.keys).map { |sid| current_hash[sid] }
+        end
 
-      # Then we remove all extra members
-      members_to_remove = (current_hash.keys - desired_hash.keys).map { |sid| current_hash[sid] }
-      remove_member_sids(*members_to_remove)
+        remove_member_sids(*members_to_remove)
+      end
     end
 
     def self.create(name)

data/lib/puppet/version.rb

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

data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems

@@ -35,110 +35,118 @@
 *
 
 /:
-        dev             = /dev/hd4
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = root
-        free            = true
-        quota           = no
+	dev		= /dev/hd4
+	vfs		= jfs2
+	check		= false
+	free		= true
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= root
 
 /home:
-        dev             = /dev/hd1
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = true
-        vol             = /home
-        free            = false
-        quota           = no
+	dev		= /dev/hd1
+	vfs		= jfs2
+	check		= true
+	free		= false
+	log		= NULL
+	mount		= true
+	quota		= no
+	vol		= /home
 
 /usr:
-        dev             = /dev/hd2
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = /usr
-        free            = false
-        quota           = no
+	dev		= /dev/hd2
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= /usr
 
 /var:
-        dev             = /dev/hd9var
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = /var
-        free            = false
-        quota           = no
+	dev		= /dev/hd9var
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= /var
 
 /tmp:
-        dev             = /dev/hd3
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        vol             = /tmp
-        free            = false
-        quota           = no
+	dev		= /dev/hd3
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	vol		= /tmp
 
 /admin:
-        dev             = /dev/hd11admin
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = false
-        vol             = /admin
-        free            = false
-        quota           = no
+	dev		= /dev/hd11admin
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= true
+	quota		= no
+	vol		= /admin
 
 /proc:
-        dev       = /proc
-        vol       = "/proc"
-        mount     = true
-        check     = false
-        free      = false
-        vfs       = procfs
+	dev		= /proc
+	vol		= "/proc"
+	mount		= true
+	check		= false
+	free		= false
+	vfs		= procfs
 
 /opt:
-        dev             = /dev/hd10opt
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = true
-        vol             = /opt
-        free            = false
-        quota           = no
+	dev		= /dev/hd10opt
+	vfs		= jfs2
+	log		= /dev/hd8
+	mount		= true
+	check		= true
+	vol		= /opt
+	free		= false
+	quota		= no
 
 /var/adm/ras/livedump:
-        dev             = /dev/livedump
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        account         = false
-        quota           = no
+	dev		= /dev/livedump
+	vfs		= jfs2
+	log		= /dev/hd8
+	mount		= true
+	account		= false
+	quota		= no
 
 
 /stage/middleware:
-        dev             = "/stage/middleware"
-        vfs             = nfs
-        nodename        = 192.168.1.11
-        mount           = true
-        type            = nfs
-        options         = ro,bg,hard,intr,sec=sys
-        account         = false
+	dev		= "/stage/middleware"
+	vfs		= nfs
+	nodename	= 192.168.1.11
+	mount		= true
+	type		= nfs
+	options		= ro,bg,hard,intr,sec=sys
+	account		= false
 
 /home/u0010689:
-        dev             = "/userdata/20010689"
-        vfs             = nfs
-        nodename        = 192.168.1.11
-        mount           = true
-        type            = nfs
-        options         = bg,hard,intr
-        account         = false
+	dev		= "/userdata/20010689"
+	vfs		= nfs
+	nodename	= 192.168.1.11
+	mount		= true
+	type		= nfs
+	options		= bg,hard,intr
+	account		= false
 
+/srv/aix:
+	dev		= /srv/aix
+	nodename	= mynode
+	vfs		= nfs
+	account		= false
+	log		= NULL
+	mount		= true
+	options		= vers=2

data/spec/fixtures/unit/provider/mount/parsed/aix.mount

@@ -1,7 +1,11 @@
-node   mounted          mounted over  vfs    date              options   
-----   -------          ------------ ---  ------------   -------------------
-       /dev/hd0         /            jfs   Dec 17 08:04   rw, log  =/dev/hd8
-       /dev/hd3         /tmp         jfs   Dec 17 08:04   rw, log  =/dev/hd8
-       /dev/hd1         /home        jfs   Dec 17 08:06   rw, log  =/dev/hd8
-       /dev/hd2         /usr         jfs   Dec 17 08:06   rw, log  =/dev/hd8
-sue    /home/local/src  /usr/code    nfs   Dec 17 08:06   ro, log  =/dev/hd8
+  node       mounted        mounted over    vfs       date        options
+-------- ---------------  ---------------  ------ ------------ ---------------
+         /dev/hd4         /                jfs2   Feb 05 10:27 rw,log=NULL
+         /dev/hd2         /usr             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd9var      /var             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd3         /tmp             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd1         /home            jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd11admin   /admin           jfs2   Feb 05 10:28 rw,log=NULL
+         /proc            /proc            procfs Feb 05 10:28 rw
+         /dev/hd10opt     /opt             jfs2   Feb 05 10:28 rw,log=NULL
+mynode   /srv/aix         /srv/aix         nfs    Mar 19 14:33 vers=2,rw 

data/spec/integration/parser/collector_spec.rb

@@ -313,5 +313,12 @@ describe Puppet::Parser::Collector do
     end
 
     it_behaves_like "virtual resource collection"
+
+    it "collects and overrides attributes specified with a * => hash" do
+      expect_the_message_to_be(["overridden1"], <<-MANIFEST)
+        notify { "testing": message => "original" }
+        Notify <|  |> { * => { message => 'overridden1' }}
+      MANIFEST
+    end
   end
 end

data/spec/integration/parser/future_compiler_spec.rb

@@ -506,6 +506,15 @@ describe "Puppet::Parser::Compiler" do
         MANIFEST
         expect(catalog).to have_resource("Notify[test]").with_parameter(:message, 'knock knock')
       end
+
+      it 'uses infer_set when reporting type mismatch' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Struct[{b => Integer, d=>String}] $a) { }
+            foo{ bar: a => {b => 5, c => 'stuff'}}
+          MANIFEST
+        end.to raise_error(/got Struct\[\{'b'=>Integer, 'c'=>String\}\]/)
+      end
     end
 
     context 'when using typed parameters in class' do

data/spec/integration/parser/resource_expressions_spec.rb

@@ -170,6 +170,9 @@ describe "Puppet resource expressions" do
              path => '/somewhere',
              * => $y }"  => "File[$t][mode] == '0666' and File[$t][owner] == 'the_x' and File[$t][path] == '/somewhere'")
 
+      produces("notify{title:}; Notify[title] { * => { message => set}}" => "Notify[title][message] == 'set'")
+      produces("Notify { * => { message => set}}; notify{title:}"      => "Notify[title][message] == 'set'")
+
       fails("notify { title: unknown => value }" => /Invalid parameter unknown/)
 
         # this really needs to be a better error message.

data/spec/unit/file_system_spec.rb

@@ -5,6 +5,18 @@ require 'puppet/util/platform'
 describe "Puppet::FileSystem" do
   include PuppetSpec::Files
 
+  def with_file_content(content)
+    path = tmpfile('file-system')
+    file = File.new(path, 'wb')
+    file.sync = true
+    file.print content
+
+    yield path
+
+  ensure
+    file.close
+  end
+
   context "#exclusive_open" do
     it "opens ands allows updating of an existing file" do
       file = file_containing("file_to_update", "the contents")
@@ -96,6 +108,32 @@ describe "Puppet::FileSystem" do
     end
   end
 
+  context "read_preserve_line_endings" do
+    it "should read a file with line feed" do
+      with_file_content("file content \n") do |file|
+        expect(Puppet::FileSystem.read_preserve_line_endings(file)).to eq("file content \n")
+      end
+    end
+
+    it "should read a file with carriage return line feed" do
+      with_file_content("file content \r\n") do |file|
+        expect(Puppet::FileSystem.read_preserve_line_endings(file)).to eq("file content \r\n")
+      end
+    end
+
+    it "should read a mixed file using only the first line newline when lf" do
+      with_file_content("file content \nsecond line \r\n") do |file|
+        expect(Puppet::FileSystem.read_preserve_line_endings(file)).to eq("file content \nsecond line \r\n")
+      end
+    end
+
+    it "should read a mixed file using only the first line newline when crlf" do
+      with_file_content("file content \r\nsecond line \n") do |file|
+        expect(Puppet::FileSystem.read_preserve_line_endings(file)).to eq("file content \r\nsecond line \n")
+      end
+    end
+  end
+
   describe "symlink",
     :if => ! Puppet.features.manages_symlinks? &&
     Puppet.features.microsoft_windows? do