puppet 3.4.3 → 3.5.0.rc1

data/spec/integration/provider/cron/crontab_spec.rb

@@ -40,6 +40,10 @@ describe Puppet::Type.type(:cron).provider(:crontab), '(integration)', :unless =
       resource.expects(:err).never
       catalog.add_resource(resource)
     end
+
+    # the resources are not properly contained and generated resources
+    # will end up with dangling edges without this stubbing:
+    catalog.stubs(:container_of).returns resources[0]
     catalog.apply
   end
 
@@ -48,6 +52,23 @@ describe Puppet::Type.type(:cron).provider(:crontab), '(integration)', :unless =
   end
 
   describe "when managing a cron entry" do
+
+    it "should be able to purge unmanaged entries" do
+      resource = Puppet::Type.type(:cron).new(
+        :name        => 'only managed entry',
+        :ensure      => :present,
+        :command     => '/bin/true',
+        :target      => crontab_user1,
+        :user        => crontab_user1
+      )
+      resources = Puppet::Type.type(:resources).new(
+        :name        => 'cron',
+        :purge       => 'true'
+      )
+      run_in_catalog(resource, resources)
+      expect_output('purged')
+    end
+
     describe "with ensure absent" do
       it "should do nothing if entry already absent" do
         resource = Puppet::Type.type(:cron).new(

data/spec/integration/provider/mount_spec.rb

@@ -35,9 +35,22 @@ describe "mount provider (integration)", :unless => Puppet.features.microsoft_wi
         else
           command.length.should == 4
           command[1].should == '-o'
+
+          # update is a special option, used on bsd's
+          # strip it out and track as a local bool here
+          update = false
+          tmp_options = command[2].split(",")
+
+          if tmp_options.include?("update")
+            update = true
+            tmp_options.delete("update")
+          end
+          @current_options = tmp_options.join(",")
+
+          if !update
+            @mounted.should == false # verify that we don't try to call "mount" redundantly
+          end
           command[3].should == '/Volumes/foo_disk'
-          @mounted.should == false # verify that we don't try to call "mount" redundantly
-          @current_options = command[2]
           @current_device = check_fstab(true)
           @mounted = true
           ''

data/spec/integration/resource/catalog_spec.rb

@@ -21,7 +21,7 @@ describe Puppet::Resource::Catalog do
       terminus = Puppet::Resource::Catalog.indirection.terminus(:yaml)
       terminus.expects(:path).with("me").returns "/my/yaml/file"
 
-      Puppet::FileSystem::File.expects(:exist?).with("/my/yaml/file").returns false
+      Puppet::FileSystem.expects(:exist?).with("/my/yaml/file").returns false
       Puppet::Resource::Catalog.indirection.find("me").should be_nil
     end
 

data/spec/integration/resource/type_collection_spec.rb

@@ -10,11 +10,10 @@ describe Puppet::Resource::TypeCollection do
 
     before do
       @dir = tmpfile("autoload_testing")
-      Puppet[:modulepath] = @dir
-
       FileUtils.mkdir_p @dir
-      @code = Puppet::Resource::TypeCollection.new("env")
-      Puppet::Node::Environment.new("env").stubs(:known_resource_types).returns @code
+
+      environment = Puppet::Node::Environment.create(:env, [@dir], '')
+      @code = environment.known_resource_types
     end
 
     # Setup a module.

data/spec/integration/ssl/autosign_spec.rb

@@ -39,7 +39,7 @@ describe "autosigning" do
 
   context "when the csr_attributes file is valid, but empty" do
     it "generates a CSR when the file is empty" do
-      Puppet::FileSystem::File.new(Puppet.settings[:csr_attributes]).touch
+      Puppet::FileSystem.touch(Puppet.settings[:csr_attributes])
 
       host.generate_certificate_request
     end

data/spec/integration/ssl/certificate_revocation_list_spec.rb

@@ -29,7 +29,7 @@ describe Puppet::SSL::CertificateRevocationList do
   it "should be able to read in written out CRLs with no revoked certificates" do
     ca = Puppet::SSL::CertificateAuthority.new
 
-    raise "CRL not created" unless Puppet::FileSystem::File.exist?(Puppet[:hostcrl])
+    raise "CRL not created" unless Puppet::FileSystem.exist?(Puppet[:hostcrl])
 
     crl = Puppet::SSL::CertificateRevocationList.new("crl_int_testing")
     crl.read(Puppet[:hostcrl])

data/spec/integration/ssl/host_spec.rb

@@ -70,7 +70,7 @@ describe Puppet::SSL::Host do
       @ca = Puppet::SSL::Host.new(Puppet::SSL::Host.ca_name)
       @ca.generate_key
 
-      Puppet::FileSystem::File.exist?(File.join(Puppet[:privatekeydir], "ca.pem")).should be_false
+      Puppet::FileSystem.exist?(File.join(Puppet[:privatekeydir], "ca.pem")).should be_false
     end
   end
 

data/spec/integration/transaction_spec.rb

@@ -64,7 +64,7 @@ describe Puppet::Transaction do
     catalog.add_resource resource
 
     catalog.apply
-    Puppet::FileSystem::File.exist?(path).should be_true
+    Puppet::FileSystem.exist?(path).should be_true
   end
 
   it "should not apply virtual exported resources" do
@@ -189,8 +189,8 @@ describe Puppet::Transaction do
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
-    Puppet::FileSystem::File.exist?(file1).should be_true
-    Puppet::FileSystem::File.exist?(file2).should be_true
+    Puppet::FileSystem.exist?(file1).should be_true
+    Puppet::FileSystem.exist?(file2).should be_true
   end
 
   it "should not let one failed refresh result in other refreshes failing" do
@@ -223,7 +223,7 @@ describe Puppet::Transaction do
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
-    Puppet::FileSystem::File.exist?(newfile).should be_true
+    Puppet::FileSystem.exist?(newfile).should be_true
   end
 
   it "should still trigger skipped resources" do
@@ -251,18 +251,18 @@ describe Puppet::Transaction do
 
     # Run it once
     catalog.apply
-    Puppet::FileSystem::File.exist?(fname).should be_true
+    Puppet::FileSystem.exist?(fname).should be_true
 
     # Now remove it, so it can get created again
-    Puppet::FileSystem::File.unlink(fname)
+    Puppet::FileSystem.unlink(fname)
 
     file[:content] = "some content"
 
     catalog.apply
-    Puppet::FileSystem::File.exist?(fname).should be_true
+    Puppet::FileSystem.exist?(fname).should be_true
 
     # Now remove it, so it can get created again
-    Puppet::FileSystem::File.unlink(fname)
+    Puppet::FileSystem.unlink(fname)
 
     # And tag our exec
     exec.tag("testrun")
@@ -275,7 +275,7 @@ describe Puppet::Transaction do
     file[:content] = "totally different content"
 
     catalog.apply
-    Puppet::FileSystem::File.exist?(fname).should be_true
+    Puppet::FileSystem.exist?(fname).should be_true
   end
 
   it "should not attempt to evaluate resources with failed dependencies" do
@@ -302,8 +302,8 @@ describe Puppet::Transaction do
     catalog = mk_catalog(exec, file1, file2)
     catalog.apply
 
-    Puppet::FileSystem::File.exist?(file1[:path]).should be_false
-    Puppet::FileSystem::File.exist?(file2[:path]).should be_false
+    Puppet::FileSystem.exist?(file1[:path]).should be_false
+    Puppet::FileSystem.exist?(file2[:path]).should be_false
   end
 
   it "should not trigger subscribing resources on failure" do
@@ -328,8 +328,8 @@ describe Puppet::Transaction do
     catalog = mk_catalog(exec, create_file1, create_file2)
     catalog.apply
 
-    Puppet::FileSystem::File.exist?(file1).should be_false
-    Puppet::FileSystem::File.exist?(file2).should be_false
+    Puppet::FileSystem.exist?(file1).should be_false
+    Puppet::FileSystem.exist?(file2).should be_false
   end
 
   # #801 -- resources only checked in noop should be rescheduled immediately.

data/spec/integration/type/exec_spec.rb

@@ -33,7 +33,7 @@ describe Puppet::Type.type(:exec) do
     catalog.add_resource exec
     catalog.apply
 
-    Puppet::FileSystem::File.exist?(path).should be_false
+    Puppet::FileSystem.exist?(path).should be_false
   end
 
   it "should execute the command if onlyif returns zero" do
@@ -72,6 +72,6 @@ describe Puppet::Type.type(:exec) do
     catalog.add_resource exec
     catalog.apply
 
-    Puppet::FileSystem::File.exist?(path).should be_false
+    Puppet::FileSystem.exist?(path).should be_false
   end
 end

data/spec/integration/type/file_spec.rb

@@ -34,15 +34,15 @@ describe Puppet::Type.type(:file) do
     end
 
     def get_mode(file)
-      Puppet::FileSystem::File.new(file).lstat.mode
+      Puppet::FileSystem.lstat(file).mode
     end
 
     def get_owner(file)
-      Puppet::FileSystem::File.new(file).lstat.uid
+      Puppet::FileSystem.lstat(file).uid
     end
 
     def get_group(file)
-      Puppet::FileSystem::File.new(file).lstat.gid
+      Puppet::FileSystem.lstat(file).gid
     end
   else
     class SecurityHelper
@@ -83,7 +83,7 @@ describe Puppet::Type.type(:file) do
     status = catalog.apply.report.resource_statuses["File[#{source}]"]
     status.should_not be_failed
     status.should_not be_changed
-    Puppet::FileSystem::File.exist?(source).should be_false
+    Puppet::FileSystem.exist?(source).should be_false
   end
 
   describe "when ensure is absent" do
@@ -92,14 +92,14 @@ describe Puppet::Type.type(:file) do
       catalog.add_resource(described_class.new(:path => path, :ensure => :absent, :backup => :false))
       report = catalog.apply.report
       report.resource_statuses["File[#{path}]"].should_not be_failed
-      Puppet::FileSystem::File.exist?(path).should be_false
+      Puppet::FileSystem.exist?(path).should be_false
     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
       report.resource_statuses["File[#{path}]"].should_not be_failed
-      Puppet::FileSystem::File.exist?(path).should be_false
+      Puppet::FileSystem.exist?(path).should be_false
     end
 
     # issue #14599
@@ -225,7 +225,7 @@ describe Puppet::Type.type(:file) do
             FileUtils.touch(link_target)
             File.chmod(0444, link_target)
 
-            Puppet::FileSystem::File.new(link_target).symlink(link)
+            Puppet::FileSystem.symlink(link_target, link)
           end
 
           it "should not set the executable bit on the link nor the target" do
@@ -233,8 +233,8 @@ describe Puppet::Type.type(:file) do
 
             catalog.apply
 
-            (Puppet::FileSystem::File.new(link).stat.mode & 07777) == 0666
-            (Puppet::FileSystem::File.new(link_target).lstat.mode & 07777) == 0444
+            (Puppet::FileSystem.stat(link).mode & 07777) == 0666
+            (Puppet::FileSystem.lstat(link_target).mode & 07777) == 0444
           end
 
           it "should ignore dangling symlinks (#6856)" do
@@ -243,7 +243,7 @@ describe Puppet::Type.type(:file) do
             catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => 0666, :target => link_target, :links => :manage)
             catalog.apply
 
-            Puppet::FileSystem::File.exist?(link).should be_false
+            Puppet::FileSystem.exist?(link).should be_false
           end
 
           it "should create a link to the target if ensure is omitted" do
@@ -251,9 +251,9 @@ describe Puppet::Type.type(:file) do
             catalog.add_resource described_class.new(:path => link, :target => link_target)
             catalog.apply
 
-            Puppet::FileSystem::File.exist?(link).should be_true
-            Puppet::FileSystem::File.new(link).lstat.ftype.should == 'link'
-            Puppet::FileSystem::File.new(link).readlink().should == link_target
+            Puppet::FileSystem.exist?(link).should be_true
+            Puppet::FileSystem.lstat(link).ftype.should == 'link'
+            Puppet::FileSystem.readlink(link).should == link_target
           end
         end
 
@@ -262,7 +262,7 @@ describe Puppet::Type.type(:file) do
             target = tmpfile('dangling')
 
             FileUtils.touch(target)
-            Puppet::FileSystem::File.new(target).symlink(link)
+            Puppet::FileSystem.symlink(target, link)
             File.delete(target)
 
             catalog.add_resource described_class.new(:path => path, :source => link, :mode => 0600, :links => :follow)
@@ -275,7 +275,7 @@ describe Puppet::Type.type(:file) do
             before :each do
               File.chmod(0600, link_target)
 
-              Puppet::FileSystem::File.new(link_target).symlink(link)
+              Puppet::FileSystem.symlink(link_target, link)
             end
 
             after :each do
@@ -338,7 +338,7 @@ describe Puppet::Type.type(:file) do
             before :each do
               FileUtils.touch(link_target)
 
-              Puppet::FileSystem::File.new(link_target).symlink(link)
+              Puppet::FileSystem.symlink(link_target, link)
             end
 
             it "should create the file, not a symlink (#2817, #10315)" do
@@ -368,8 +368,8 @@ describe Puppet::Type.type(:file) do
               File.chmod(0666, real_target)
 
               # link -> target -> real_target
-              Puppet::FileSystem::File.new(real_target).symlink(target)
-              Puppet::FileSystem::File.new(target).symlink(link)
+              Puppet::FileSystem.symlink(real_target, target)
+              Puppet::FileSystem.symlink(target, link)
             end
 
             after :each do
@@ -426,7 +426,7 @@ describe Puppet::Type.type(:file) do
       catalog.apply
 
       backup = file[:path] + ".bak"
-      Puppet::FileSystem::File.exist?(backup).should be_true
+      Puppet::FileSystem.exist?(backup).should be_true
       File.read(backup).should == "bar\n"
     end
 
@@ -458,14 +458,14 @@ describe Puppet::Type.type(:file) do
       catalog.add_resource bucket
 
       File.open(dest1, "w") { |f| f.puts "whatever" }
-      Puppet::FileSystem::File.new(dest1).symlink(link)
+      Puppet::FileSystem.symlink(dest1, link)
 
       md5 = Digest::MD5.hexdigest(File.read(file[:path]))
 
       catalog.apply
 
-      Puppet::FileSystem::File.new(link).readlink().should == dest2
-      Puppet::FileSystem::File.exist?(bucket[:path]).should be_false
+      Puppet::FileSystem.readlink(link).should == dest2
+      Puppet::FileSystem.exist?(bucket[:path]).should be_false
     end
 
     it "should backup directories to the local filesystem by copying the whole directory" do
@@ -587,13 +587,13 @@ describe Puppet::Type.type(:file) do
       @dirs.each do |path|
         link_path = path.sub(source, dest)
 
-        Puppet::FileSystem::File.new(link_path).lstat.should be_directory
+        Puppet::FileSystem.lstat(link_path).should be_directory
       end
 
       @files.each do |path|
         link_path = path.sub(source, dest)
 
-        Puppet::FileSystem::File.new(link_path).lstat.ftype.should == "link"
+        Puppet::FileSystem.lstat(link_path).ftype.should == "link"
       end
     end
 
@@ -613,13 +613,13 @@ describe Puppet::Type.type(:file) do
       @dirs.each do |path|
         newpath = path.sub(source, dest)
 
-        Puppet::FileSystem::File.new(newpath).lstat.should be_directory
+        Puppet::FileSystem.lstat(newpath).should be_directory
       end
 
       @files.each do |path|
         newpath = path.sub(source, dest)
 
-        Puppet::FileSystem::File.new(newpath).lstat.ftype.should == "file"
+        Puppet::FileSystem.lstat(newpath).ftype.should == "file"
       end
     end
 
@@ -682,8 +682,8 @@ describe Puppet::Type.type(:file) do
             catalog.apply
 
             File.should be_directory(path)
-            Puppet::FileSystem::File.exist?(File.join(path, 'one')).should be_false
-            Puppet::FileSystem::File.exist?(File.join(path, 'three', 'four')).should be_true
+            Puppet::FileSystem.exist?(File.join(path, 'one')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'three', 'four')).should be_true
           end
 
           it "should recursively copy an empty directory" do
@@ -704,7 +704,7 @@ describe Puppet::Type.type(:file) do
             catalog.apply
 
             File.should be_directory(path)
-            Puppet::FileSystem::File.exist?(File.join(path, 'a')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'a')).should be_false
           end
 
           it "should only recurse one level" do
@@ -728,9 +728,9 @@ describe Puppet::Type.type(:file) do
 
             catalog.apply
 
-            Puppet::FileSystem::File.exist?(File.join(path, 'a')).should be_true
-            Puppet::FileSystem::File.exist?(File.join(path, 'a', 'b')).should be_false
-            Puppet::FileSystem::File.exist?(File.join(path, 'z')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'a')).should be_true
+            Puppet::FileSystem.exist?(File.join(path, 'a', 'b')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'z')).should be_false
           end
         end
 
@@ -827,10 +827,10 @@ describe Puppet::Type.type(:file) do
             catalog.add_resource obj
             catalog.apply
 
-            Puppet::FileSystem::File.exist?(File.join(path, 'a')).should be_true
-            Puppet::FileSystem::File.exist?(File.join(path, 'a', 'b')).should be_false
-            Puppet::FileSystem::File.exist?(File.join(path, 'z')).should be_true
-            Puppet::FileSystem::File.exist?(File.join(path, 'z', 'y')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'a')).should be_true
+            Puppet::FileSystem.exist?(File.join(path, 'a', 'b')).should be_false
+            Puppet::FileSystem.exist?(File.join(path, 'z')).should be_true
+            Puppet::FileSystem.exist?(File.join(path, 'z', 'y')).should be_false
           end
         end
       end
@@ -886,15 +886,16 @@ describe Puppet::Type.type(:file) do
     it "should be able to copy files with spaces in their names" do
       dest = tmpfile("destwith spaces")
       source = tmpfile_with_contents("filewith spaces", "foo")
-      File.chmod(0755, source)
+
+      expected_mode = 0755
+      Puppet::FileSystem.chmod(expected_mode, source)
 
       catalog.add_resource described_class.new(:path => dest, :source => source)
 
       catalog.apply
 
-      expected_mode = Puppet.features.microsoft_windows? ? 0644 : 0755
       File.read(dest).should == "foo"
-      (Puppet::FileSystem::File.new(dest).stat.mode & 007777).should == expected_mode
+      (Puppet::FileSystem.stat(dest).mode & 007777).should == expected_mode
     end
 
     it "should be able to copy individual files even if recurse has been specified" do
@@ -946,7 +947,7 @@ describe Puppet::Type.type(:file) do
     catalog.add_resource file
     catalog.apply
 
-    Puppet::FileSystem::File.exist?(dest).should be_false
+    Puppet::FileSystem.exist?(dest).should be_false
   end
 
   describe "when sourcing" do
@@ -1021,6 +1022,7 @@ describe Puppet::Type.type(:file) do
       end
 
       it "should provide valid default values when ACLs are not supported" do
+        Puppet::Util::Windows::Security.stubs(:supports_acl?).returns(false)
         Puppet::Util::Windows::Security.stubs(:supports_acl?).with(source).returns false
 
         file = described_class.new(
@@ -1140,6 +1142,20 @@ describe Puppet::Type.type(:file) do
               system_aces.size.should == 1
             end
           end
+
+          describe "with :links set to :follow" do
+            it "should not fail to apply" do
+              # at minimal, we need an owner and/or group
+              @file[:owner] = @sids[:users]
+              @file[:links] = :follow
+
+              catalog.apply do |transaction|
+                if transaction.any_failed?
+                  pretty_transaction_error(transaction)
+                end
+              end
+            end
+          end
         end
 
         describe "on directories" do
@@ -1151,6 +1167,19 @@ describe Puppet::Type.type(:file) do
             catalog.add_resource @directory
           end
 
+          def grant_everyone_full_access(path)
+            sd = Puppet::Util::Windows::Security.get_security_descriptor(path)
+            sd.dacl.allow(
+              'S-1-1-0', #everyone
+              Windows::File::FILE_ALL_ACCESS,
+              Windows::File::OBJECT_INHERIT_ACE | Windows::File::CONTAINER_INHERIT_ACE)
+            Puppet::Util::Windows::Security.set_security_descriptor(path, sd)
+          end
+
+          after :each do
+            grant_everyone_full_access(dir)
+          end
+
           describe "when source permissions are ignored" do
             before :each do
               @directory[:source_permissions] = :ignore
@@ -1233,6 +1262,20 @@ describe Puppet::Type.type(:file) do
                 system_aces.size.should == 1
               end
             end
+
+            describe "with :links set to :follow" do
+              it "should not fail to apply" do
+                # at minimal, we need an owner and/or group
+                @directory[:owner] = @sids[:users]
+                @directory[:links] = :follow
+
+                catalog.apply do |transaction|
+                  if transaction.any_failed?
+                    pretty_transaction_error(transaction)
+                  end
+                end
+              end
+            end
           end
         end
       end
@@ -1284,7 +1327,25 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should purge files that are neither remote nor otherwise managed" do
-      Puppet::FileSystem::File.exist?(@purgee).should be_false
+      Puppet::FileSystem.exist?(@purgee).should be_false
+    end
+  end
+
+  describe "when using validate_cmd" do
+    it "should fail the file resource if command fails" do
+      catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env false"))
+      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).raises(Puppet::ExecutionFailure, "Failed")
+      report = catalog.apply.report
+      report.resource_statuses["File[#{path}]"].should be_failed
+      Puppet::FileSystem.exist?(path).should be_false
+    end
+
+    it "should succeed the file resource if command succeeds" do
+      catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
+      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env true", {:combine => true, :failonfail => true}).returns ''
+      report = catalog.apply.report
+      report.resource_statuses["File[#{path}]"].should_not be_failed
+      Puppet::FileSystem.exist?(path).should be_true
     end
   end
 
@@ -1299,4 +1360,16 @@ describe Puppet::Type.type(:file) do
     File.open(full_name, "w") { |f| f.write contents }
     full_name
   end
+
+  def pretty_transaction_error(transaction)
+    report = transaction.report
+    status_failures = report.resource_statuses.values.select { |r| r.failed? }
+    status_fail_msg = status_failures.
+      collect(&:events).
+      flatten.
+      select { |event| event.status == 'failure' }.
+      collect { |event| "#{event.resource}: #{event.message}" }.join("; ")
+
+    raise "Got #{status_failures.length} failure(s) while applying: #{status_fail_msg}"
+  end
 end