puppet 4.0.0 → 4.1.0

data/spec/integration/parser/resource_expressions_spec.rb

@@ -164,6 +164,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/integration/parser/scope_spec.rb

@@ -36,8 +36,30 @@ describe "Two step scoping for variables" do
     end
   end
 
-  it "when using a template ignores the dynamic value of the var when using the @varname syntax" do
-    expect_the_message_to_be('node_msg') do <<-MANIFEST
+    it "issues error about built-in variable when reassigning to name" do
+        enc_node = Puppet::Node.new("the_node", { :parameters => {  } })
+
+        expect {
+          compile_to_catalog("$name = 'never in a 0xF4240 years'", enc_node)
+        }.to raise_error(
+          Puppet::Error,
+          /Cannot reassign built in \(or already assigned\) variable '\$name' at line 1(\:7)? on node the_node/
+        )
+    end
+
+    it "issues error about built-in variable when reassigning to title" do
+        enc_node = Puppet::Node.new("the_node", { :parameters => {  } })
+
+        expect {
+          compile_to_catalog("$title = 'never in a 0xF4240 years'", enc_node)
+        }.to raise_error(
+          Puppet::Error,
+          /Cannot reassign built in \(or already assigned\) variable '\$title' at line 1(\:8)? on node the_node/
+        )
+    end
+
+    it "when using a template ignores the dynamic value of the var when using the @varname syntax" do
+      expect_the_message_to_be('node_msg') do <<-MANIFEST
           node default {
             $var = "node_msg"
             include foo
@@ -589,12 +611,11 @@ describe "Two step scoping for variables" do
 
     it "does not allow the enc to specify an existing top scope var" do
       enc_node = Puppet::Node.new("the_node", { :parameters => { "var" => 'from_enc' } })
-
       expect {
         compile_to_catalog("$var = 'top scope'", enc_node)
       }.to raise_error(
-      Puppet::Error,
-      /Cannot reassign variable var at line 1(\:6)? on node the_node/
+        Puppet::Error,
+        /Cannot reassign variable '\$var' at line 1(\:6)? on node the_node/
       )
     end
 

data/spec/integration/transaction_spec.rb

@@ -229,7 +229,7 @@ describe Puppet::Transaction do
     notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
 
     catalog = mk_catalog(file, notify)
-    catalog.apply
+    expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
     expect(Puppet::FileSystem.exist?(path)).not_to be_truthy
   end
 

data/spec/integration/type/file_spec.rb

@@ -93,20 +93,77 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     expect(Puppet::FileSystem.exist?(source)).to be_falsey
   end
 
+  describe "when ensure is present using an empty file" do
+    before(:each) do
+      catalog.add_resource(described_class.new(:path => path, :ensure => :present, :backup => :false))
+    end
+
+    context "file is present" do
+      before(:each) do
+        FileUtils.touch(path)
+      end
+
+      it "should do nothing" do
+        report = catalog.apply.report
+        expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
+        expect(Puppet::FileSystem.exist?(path)).to be_truthy
+      end
+
+      it "should log nothing" do
+        logs = catalog.apply.report.logs
+        expect(logs).to be_empty
+      end
+    end
+
+    context "file is not present" do
+      it "should create the file" do
+        report = catalog.apply.report
+        expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
+        expect(Puppet::FileSystem.exist?(path)).to be_truthy
+      end
+
+      it "should log that the file was created" do
+        logs = catalog.apply.report.logs
+        expect(logs.first.source).to eq("/File[#{path}]/ensure")
+        expect(logs.first.message).to eq("created")
+      end
+    end
+  end
+
   describe "when ensure is absent" do
-    it "should remove the file if present" do
-      FileUtils.touch(path)
+    before(:each) do
       catalog.add_resource(described_class.new(:path => path, :ensure => :absent, :backup => :false))
-      report = catalog.apply.report
-      expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
-      expect(Puppet::FileSystem.exist?(path)).to be_falsey
     end
 
-    it "should do nothing if file is not present" do
-      catalog.add_resource(described_class.new(:path => path, :ensure => :absent, :backup => :false))
-      report = catalog.apply.report
-      expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
-      expect(Puppet::FileSystem.exist?(path)).to be_falsey
+    context "file is present" do
+      before(:each) do
+        FileUtils.touch(path)
+      end
+
+      it "should remove the file" do
+        report = catalog.apply.report
+        expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
+        expect(Puppet::FileSystem.exist?(path)).to be_falsey
+      end
+
+      it "should log that the file was removed" do
+        logs = catalog.apply.report.logs
+        expect(logs.first.source).to eq("/File[#{path}]/ensure")
+        expect(logs.first.message).to eq("removed")
+      end
+    end
+
+    context "file is not present" do
+      it "should do nothing" do
+        report = catalog.apply.report
+        expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
+        expect(Puppet::FileSystem.exist?(path)).to be_falsey
+      end
+
+      it "should log nothing" do
+        logs = catalog.apply.report.logs
+        expect(logs).to be_empty
+      end
     end
 
     # issue #14599
@@ -215,7 +272,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
           FileUtils.mkdir(path)
           set_mode(0777, path)
 
-          catalog.add_resource described_class.new(:path => path, :ensure => :file, :mode => 0666, :backup => false, :force => true)
+          catalog.add_resource described_class.new(:path => path, :ensure => :file, :mode => '0666', :backup => false, :force => true)
           catalog.apply
 
           expect(get_mode(path) & 07777).to eq(0666)
@@ -356,14 +413,26 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
               expect(get_mode(path) & 07777).to eq(0600)
             end
 
-            it "should overwrite the file" do
-              FileUtils.touch(path)
+            context "overwriting a file" do
+              before :each do
+                FileUtils.touch(path)
+                set_mode(0644, path)
+                catalog.add_resource described_class.new(:path => path, :source => link, :mode => '0600', :links => :follow)
+              end
 
-              catalog.add_resource described_class.new(:path => path, :source => link, :mode => '0600', :links => :follow)
-              catalog.apply
+              it "should overwrite the file" do
+                catalog.apply
 
-              expect(File).to be_file(path)
-              expect(get_mode(path) & 07777).to eq(0600)
+                expect(File).to be_file(path)
+                expect(get_mode(path) & 07777).to eq(0600)
+              end
+
+              it "should log that the mode changed" do
+                report = catalog.apply.report
+
+                expect(report.logs.first.message).to eq("mode changed '0644' to '0600'")
+                expect(report.logs.first.source).to eq("/File[#{path}]/mode")
+              end
             end
           end
 
@@ -981,32 +1050,114 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   end
 
   CHECKSUM_TYPES_TO_TRY.each do |checksum_type, checksum|
-    before(:each) do
-      @options = {:path => path, :content => "this is some content, yo", :checksum => checksum_type}
-    end
-    it "should create a file with content if ensure is omitted" do
-      catalog.add_resource described_class.send(:new, @options)
-      catalog.apply
-      expect(File.read(path)).to eq("this is some content, yo")
+    describe "when checksum_type is #{checksum_type}" do
+      before(:each) do
+        @options = {:path => path, :content => CHECKSUM_PLAINTEXT, :checksum => checksum_type}
+      end
 
-      second_catalog = Puppet::Resource::Catalog.new
-      second_catalog.add_resource described_class.send(:new, @options)
-      status = second_catalog.apply.report.resource_statuses["File[#{path}]"]
-      expect(status).not_to be_failed
-      expect(status).not_to be_changed
-    end
+      context "when changing the content" do
+        before :each do
+          FileUtils.touch(path)
+          catalog.add_resource described_class.send(:new, @options)
+        end
 
-    it "should create files with content if both content and ensure are set" do
-      @options[:ensure] = "file"
-      catalog.add_resource described_class.send(:new, @options)
-      catalog.apply
-      expect(File.read(path)).to eq("this is some content, yo")
+        it "should overwrite contents" do
+          catalog.apply
+          expect(Puppet::FileSystem.binread(path)).to eq(CHECKSUM_PLAINTEXT)
+        end
+
+        it "should log that content changed" do
+          report = catalog.apply.report
+          expect(report.logs.first.source).to eq("/File[#{path}]/content")
+          expect(report.logs.first.message).to match(/content changed '{#{checksum_type}}[0-9a-f]*' to '{#{checksum_type}}#{checksum}'/)
+        end
+      end
+
+      context "ensure is present" do
+        before(:each) do
+          @options[:ensure] = "present"
+        end
 
-      second_catalog = Puppet::Resource::Catalog.new
-      second_catalog.add_resource described_class.send(:new, @options)
-      status = second_catalog.apply.report.resource_statuses["File[#{path}]"]
-      expect(status).not_to be_failed
-      expect(status).not_to be_changed
+        it "should create a file with content" do
+          catalog.add_resource described_class.send(:new, @options)
+          catalog.apply
+          expect(Puppet::FileSystem.binread(path)).to eq(CHECKSUM_PLAINTEXT)
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          status = second_catalog.apply.report.resource_statuses["File[#{path}]"]
+          expect(status).not_to be_failed
+          expect(status).not_to be_changed
+        end
+
+        it "should log the content checksum" do
+          catalog.add_resource described_class.send(:new, @options)
+          report = catalog.apply.report
+          expect(report.logs.first.source).to eq("/File[#{path}]/ensure")
+          expect(report.logs.first.message).to eq("defined content as '{#{checksum_type}}#{checksum}'")
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          logs = second_catalog.apply.report.logs
+          expect(logs).to be_empty
+        end
+      end
+
+      context "ensure is omitted" do
+        it "should create a file with content" do
+          catalog.add_resource described_class.send(:new, @options)
+          catalog.apply
+          expect(Puppet::FileSystem.binread(path)).to eq(CHECKSUM_PLAINTEXT)
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          status = second_catalog.apply.report.resource_statuses["File[#{path}]"]
+          expect(status).not_to be_failed
+          expect(status).not_to be_changed
+        end
+
+        it "should log the content checksum" do
+          catalog.add_resource described_class.send(:new, @options)
+          report = catalog.apply.report
+          expect(report.logs.first.source).to eq("/File[#{path}]/ensure")
+          expect(report.logs.first.message).to eq("defined content as '{#{checksum_type}}#{checksum}'")
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          logs = second_catalog.apply.report.logs
+          expect(logs).to be_empty
+        end
+      end
+
+      context "both content and ensure are set" do
+        before(:each) do
+          @options[:ensure] = "file"
+        end
+
+        it "should create files with content" do
+          catalog.add_resource described_class.send(:new, @options)
+          catalog.apply
+          expect(Puppet::FileSystem.binread(path)).to eq(CHECKSUM_PLAINTEXT)
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          status = second_catalog.apply.report.resource_statuses["File[#{path}]"]
+          expect(status).not_to be_failed
+          expect(status).not_to be_changed
+        end
+
+        it "should log the content checksum" do
+          catalog.add_resource described_class.send(:new, @options)
+          report = catalog.apply.report
+          expect(report.logs.first.source).to eq("/File[#{path}]/ensure")
+          expect(report.logs.first.message).to eq("defined content as '{#{checksum_type}}#{checksum}'")
+
+          second_catalog = Puppet::Resource::Catalog.new
+          second_catalog.add_resource described_class.send(:new, @options)
+          logs = second_catalog.apply.report.logs
+          expect(logs).to be_empty
+        end
+      end
     end
   end
 
@@ -1111,7 +1262,6 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
           @sids = {
             :current_user => Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name),
             :system => Win32::Security::SID::LocalSystem,
-            :admin => Puppet::Util::Windows::SID.name_to_sid("Administrator"),
             :guest => Puppet::Util::Windows::SID.name_to_sid("Guest"),
             :users => Win32::Security::SID::BuiltinUsers,
             :power_users => Win32::Security::SID::PowerUsers,
@@ -1377,4 +1527,131 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
     raise "Got #{status_failures.length} failure(s) while applying: #{status_fail_msg}"
   end
+
+  describe "copying a file that is a link to a file", :if => Puppet.features.manages_symlinks? do
+    let(:target) { tmpfile('target') }
+    let(:link) { tmpfile('link') }
+    let(:copy) { tmpfile('copy') }
+    it "should copy the target of the link if :links => follow" do
+      catalog.add_resource described_class.new(
+        :name => target,
+        :ensure => "present",
+        :content => "Jenny I got your number / I need to make you mine")
+      catalog.add_resource described_class.new(
+        :name => link,
+        :ensure => "link",
+        :target => target)
+      catalog.add_resource described_class.new(
+        :name => copy,
+        :ensure => "present",
+        :source => link,
+        :links => "follow")
+      catalog.apply
+      expect(Puppet::FileSystem).to be_file(copy)
+      expect(File.read(target)).to eq(File.read(copy))
+    end
+
+    it "should copy the link itself if :links => manage" do
+      catalog.add_resource described_class.new(
+        :name => target,
+        :ensure => "present",
+        :content => "Jenny I got your number / I need to make you mine")
+      catalog.add_resource described_class.new(
+        :name => link,
+        :ensure => "link",
+        :target => target)
+      catalog.add_resource described_class.new(
+        :name => copy,
+        :ensure => "present",
+        :source => link,
+        :links => "manage")
+      catalog.apply
+      expect(Puppet::FileSystem).to be_symlink(copy)
+      expect(File.read(link)).to eq(File.read(copy))
+    end
+  end
+
+  describe "copying a file that is a link to a directory", :if => Puppet.features.manages_symlinks? do
+    let(:target) { tmpdir('target') }
+    let(:link) { tmpfile('link') }
+    let(:copy) { tmpfile('copy') }
+    context "when the recurse attribute is false" do
+      it "should copy the top-level directory if :links => follow" do
+        catalog.add_resource described_class.new(
+          :name => target,
+          :ensure => "directory")
+        catalog.add_resource described_class.new(
+          :name => link,
+          :ensure => "link",
+          :target => target)
+        catalog.add_resource described_class.new(
+          :name => copy,
+          :ensure => "present",
+          :source => link,
+          :recurse => false,
+          :links => "follow")
+        catalog.apply
+        expect(Puppet::FileSystem).to be_directory(copy)
+      end
+    
+      it "should copy the link itself if :links => manage" do
+        catalog.add_resource described_class.new(
+          :name => target,
+          :ensure => "directory")
+        catalog.add_resource described_class.new(
+          :name => link,
+          :ensure => "link",
+          :target => target)
+        catalog.add_resource described_class.new(
+          :name => copy,
+          :ensure => "present",
+          :source => link,
+          :recurse => false,
+          :links => "manage")
+        catalog.apply
+        expect(Puppet::FileSystem).to be_symlink(copy)
+        expect(Dir.entries(link)).to eq(Dir.entries(copy))
+      end
+    end
+  
+    context "and the recurse attribute is true" do
+      it "should recursively copy the directory if :links => follow" do
+        catalog.add_resource described_class.new(
+          :name => target,
+          :ensure => "directory")
+        catalog.add_resource described_class.new(
+          :name => link,
+          :ensure => "link",
+          :target => target)
+        catalog.add_resource described_class.new(
+          :name => copy,
+          :ensure => "present",
+          :source => link,
+          :recurse => true,
+          :links => "follow")
+        catalog.apply
+        expect(Puppet::FileSystem).to be_directory(copy)
+        expect(Dir.entries(target)).to eq(Dir.entries(copy))
+      end
+
+      it "should copy the link itself if :links => manage" do
+        catalog.add_resource described_class.new(
+          :name => target,
+          :ensure => "directory")
+        catalog.add_resource described_class.new(
+          :name => link,
+          :ensure => "link",
+          :target => target)
+        catalog.add_resource described_class.new(
+          :name => copy,
+          :ensure => "present",
+          :source => link,
+          :recurse => true,
+          :links => "manage")
+        catalog.apply
+        expect(Puppet::FileSystem).to be_symlink(copy)
+        expect(Dir.entries(link)).to eq(Dir.entries(copy))
+      end
+    end
+  end
 end