puppet 5.3.7-universal-darwin → 5.4.0-universal-darwin

data/spec/unit/puppet_pal_spec.rb

@@ -0,0 +1,11 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet_spec/files'
+
+require_relative('puppet_pal_2pec') unless RUBY_VERSION == '1.9.3'
+
+#describe 'Puppet Pal' do
+#  pending("Puppet::Pal is not available on Ruby 1.9.3") if RUBY_VERSION == '1.9.3'
+##  before { skip("Puppet::Pal is not available on Ruby 1.9.3") if RUBY_VERSION == '1.9.3' }
+#  require_relative 'puppet_pal_2pec'
+#end

data/spec/unit/settings/ini_file_spec.rb

@@ -44,7 +44,7 @@ describe Puppet::Settings::IniFile do
     expect(config_fh.string).to eq "[the_section]\n#{mixed_utf8} = #{mixed_utf8.reverse}\n"
   end
 
-  it "does not add a [main] section to a file when it isn't needed" do
+  it "adds a [main] section to a file when it's needed" do
     config_fh = a_config_file_containing(<<-CONF)
     [section]
     name = different value
@@ -56,6 +56,7 @@ describe Puppet::Settings::IniFile do
     end
 
     expect(config_fh.string).to eq(<<-CONF)
+[main]
 name = value
     [section]
     name = different value
@@ -108,6 +109,46 @@ name = value
     CONFIG
   end
 
+  it "updates existing empty settings" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    # this is the preceding comment
+     [section]
+    name = 
+    # this is the trailing comment
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "name", "changed value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    # this is the preceding comment
+     [section]
+    name = changed value
+    # this is the trailing comment
+    CONFIG
+  end
+
+  it "can set empty settings" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    # this is the preceding comment
+     [section]
+    name = original value
+    # this is the trailing comment
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "name", "")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    # this is the preceding comment
+     [section]
+    name = 
+    # this is the trailing comment
+    CONFIG
+  end
+
   it "updates existing UTF-8 name / values in place" do
     config_fh = a_config_file_containing(<<-CONFIG)
     # this is the preceding comment
@@ -151,7 +192,7 @@ name = value
     CONFIG
   end
 
-  it "considers settings outside a section to be in section 'main'" do
+  it "considers settings found outside a section to be in section 'main'" do
     config_fh = a_config_file_containing(<<-CONFIG)
     name = original value
     CONFIG
@@ -161,6 +202,7 @@ name = value
     end
 
     expect(config_fh.string).to eq <<-CONFIG
+[main]
     name = changed value
     CONFIG
   end
@@ -234,6 +276,275 @@ updated = new
     CONFIG
   end
 
+  it "adds a new setting to the appropriate section, when it would be added behind a setting with an identical value in a preceeding section" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    [different]
+    name = some value
+    [section]
+    name = some value
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "new", "new value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    [different]
+    name = some value
+    [section]
+    name = some value
+new = new value
+    CONFIG
+  end
+
+  context 'config with no main section' do
+    it 'file does not change when there are no sections or entries' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'missing')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      CONFIG
+    end
+
+    it 'when there is only 1 entry we can delete it' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      base = value
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      CONFIG
+    end
+
+    it 'we delete 1 entry from the default section and add the [main] section header' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      base = value
+      other = another value
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+[main]
+      other = another value
+      CONFIG
+    end
+
+    it 'we add [main] to the config file when attempting to delete a setting in another section' do
+      config_fh = a_config_file_containing(<<-CONF)
+      name = different value
+      CONF
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('section', 'name')
+      end
+
+      expect(config_fh.string).to eq(<<-CONF)
+[main]
+      name = different value
+      CONF
+    end
+  end
+
+  context 'config with 1 section' do
+    it 'file does not change when entry to delete does not exist' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = value
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'missing')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      base = value
+      CONFIG
+    end
+
+    it 'deletes the 1 entry in the section' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = DELETING
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      CONFIG
+    end
+
+    it 'deletes the entry and leaves another entry' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = DELETING
+      after = value to keep
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      after = value to keep
+      CONFIG
+    end
+
+    it 'deletes the entry while leaving other entries' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      before = value to keep before
+      base = DELETING
+      after = value to keep
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      before = value to keep before
+      after = value to keep
+      CONFIG
+    end
+
+    it 'when there are two entries of the same setting name delete one of them' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = value
+      base = value
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('main', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      base = value
+      CONFIG
+    end
+  end
+
+  context 'with 2 sections' do
+    it 'file does not change when entry to delete does not exist' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = value
+      [section]
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('section', 'missing')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      base = value
+      [section]
+      CONFIG
+    end
+
+    it 'deletes the 1 entry in the specified section' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      base = value
+      [section]
+      base = value
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('section', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      base = value
+      [section]
+      CONFIG
+    end
+
+    it 'deletes the entry while leaving other entries' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      before = value also staying
+      base = value staying
+      after = value to keep
+      [section]
+      before value in section keeping
+      base = DELETING
+      after = value to keep
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('section', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      before = value also staying
+      base = value staying
+      after = value to keep
+      [section]
+      before value in section keeping
+      after = value to keep
+      CONFIG
+    end
+  end
+
+  context 'with 2 sections' do
+    it 'deletes the entry while leaving other entries' do
+      config_fh = a_config_file_containing(<<-CONFIG)
+      [main]
+      before = value also staying
+      base = value staying
+      after = value to keep
+      [section]
+      before value in section keeping
+      base = DELETING
+      after = value to keep
+      [otherSection]
+      before value in section keeping
+      base = value to keep really
+      after = value to keep
+      CONFIG
+
+      Puppet::Settings::IniFile.update(config_fh) do |config|
+        config.delete('section', 'base')
+      end
+
+      expect(config_fh.string).to eq <<-CONFIG
+      [main]
+      before = value also staying
+      base = value staying
+      after = value to keep
+      [section]
+      before value in section keeping
+      after = value to keep
+      [otherSection]
+      before value in section keeping
+      base = value to keep really
+      after = value to keep
+      CONFIG
+    end
+  end
+
+
   def a_config_file_containing(text)
     # set_encoding required for Ruby 1.9.3 as ASCII is the default
     StringIO.new(text).set_encoding(Encoding::UTF_8)

data/spec/unit/ssl/certificate_request_spec.rb

@@ -335,10 +335,51 @@ describe Puppet::SSL::CertificateRequest do
       expect(csr.verify(key.content)).to be_truthy
     end
 
-    it "should raise an error if neither SHA256 nor SHA1 are available" do
+    # Attempts to use SHA512 and SHA384 for signing certificates don't seem to work
+    # So commenting it out till it is sorted out
+    # The problem seems to be with the ability to sign a CSR when using either of
+    # these hash algorithms
+
+#    it "should use SHA512 to sign the csr when SHA256 and SHA1 aren't available" do
+#      csr = OpenSSL::X509::Request.new
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(true)
+#      signer = Puppet::SSL::CertificateSigner.new
+#      signer.sign(csr, key.content)
+#      expect(csr.verify(key.content)).to be_truthy
+#    end
+
+#    it "should use SHA384 to sign the csr when SHA256/SHA1/SHA512 aren't available" do
+#      csr = OpenSSL::X509::Request.new
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(false)
+#      OpenSSL::Digest.expects(:const_defined?).with("SHA384").returns(true)
+#      signer = Puppet::SSL::CertificateSigner.new
+#      signer.sign(csr, key.content)
+#      expect(csr.verify(key.content)).to be_truthy
+#    end
+
+    it "should use SHA224 to sign the csr when SHA256/SHA1/SHA512/SHA384 aren't available" do
       csr = OpenSSL::X509::Request.new
       OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
       OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA384").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA224").returns(true)
+      signer = Puppet::SSL::CertificateSigner.new
+      signer.sign(csr, key.content)
+      expect(csr.verify(key.content)).to be_truthy
+    end
+
+    it "should raise an error if neither SHA256/SHA1/SHA512/SHA384/SHA224 are available" do
+      csr = OpenSSL::X509::Request.new
+      OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA384").returns(false)
+      OpenSSL::Digest.expects(:const_defined?).with("SHA224").returns(false)
       expect {
         signer = Puppet::SSL::CertificateSigner.new
       }.to raise_error(Puppet::Error)

data/spec/unit/ssl/certificate_revocation_list_spec.rb

@@ -156,7 +156,8 @@ describe Puppet::SSL::CertificateRevocationList do
     end
 
     it "should sign the CRL with the CA's private key and a digest instance" do
-      @crl.content.expects(:sign).with { |key, digest| key == @key and digest.is_a?(OpenSSL::Digest::SHA1) }
+      digest = Puppet::SSL::CertificateSigner.new.digest
+      @crl.content.expects(:sign).with { |key, signer| key == @key and signer.is_a?(digest) }
       @crl.revoke(1, @key)
     end
 

data/spec/unit/transaction/report_spec.rb

@@ -583,6 +583,7 @@ describe Puppet::Transaction::Report do
     expect(tripped.report_format).to eq(report.report_format)
     expect(tripped.puppet_version).to eq(report.puppet_version)
     expect(tripped.status).to eq(report.status)
+    expect(tripped.transaction_completed).to eq(report.transaction_completed)
     expect(tripped.environment).to eq(report.environment)
     expect(tripped.corrective_change).to eq(report.corrective_change)
 

data/spec/unit/transaction_spec.rb

@@ -4,7 +4,6 @@ require 'matchers/include_in_order'
 require 'puppet_spec/compiler'
 
 require 'puppet/transaction'
-require 'puppet/transaction/persistence'
 require 'fileutils'
 
 describe Puppet::Transaction do
@@ -132,31 +131,31 @@ describe Puppet::Transaction do
         transaction.evaluate
       end
     end
+  end
 
-    describe "when evaluating a skipped resource for corrective change it" do
-      before :each do
-        # Enable persistence during tests
-        Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
-      end
+  describe "when evaluating a skipped resource for corrective change it" do
+    before :each do
+      # Enable persistence during tests
+      Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
+    end
 
-      it "should persist in the transactionstore" do
-        Puppet[:transactionstorefile] = tmpfile('persistence_test')
+    it "should persist in the transactionstore" do
+      Puppet[:transactionstorefile] = tmpfile('persistence_test')
 
-        resource = Puppet::Type.type(:notify).new :title => "foobar"
-        transaction = transaction_with_resource(resource)
-        transaction.evaluate
-        expect(transaction.resource_status(resource)).to be_changed
+      resource = Puppet::Type.type(:notify).new :title => "foobar"
+      transaction = transaction_with_resource(resource)
+      transaction.evaluate
+      expect(transaction.resource_status(resource)).to be_changed
 
-        transaction = transaction_with_resource(resource)
-        transaction.expects(:skip?).with(resource).returns true
-        transaction.event_manager.expects(:process_events).with(resource).never
-        transaction.evaluate
-        expect(transaction.resource_status(resource)).to be_skipped
+      transaction = transaction_with_resource(resource)
+      transaction.expects(:skip?).with(resource).returns true
+      transaction.event_manager.expects(:process_events).with(resource).never
+      transaction.evaluate
+      expect(transaction.resource_status(resource)).to be_skipped
 
-        persistence = Puppet::Transaction::Persistence.new
-        persistence.load
-        expect(persistence.get_system_value(resource.ref, "message")).to eq(["foobar"])
-      end
+      persistence = Puppet::Transaction::Persistence.new
+      persistence.load
+      expect(persistence.get_system_value(resource.ref, "message")).to eq(["foobar"])
     end
   end
 
@@ -591,6 +590,98 @@ describe Puppet::Transaction do
 
       transaction.prefetch_if_necessary(resource)
     end
+
+    it "should not prefetch a provider which has failed" do
+      transaction.prefetch_failed_providers[:sshkey][:parsed] = true
+
+      resource.provider.class.expects(:prefetch).never
+
+      transaction.prefetch_if_necessary(resource)
+    end
+
+    describe "and prefetching fails" do
+      before :each do
+        resource.provider.class.expects(:prefetch).raises(Puppet::Error, "message")
+      end
+
+      context "without future_features flag" do
+        before :each do
+          Puppet.settings[:future_features] = false
+        end
+
+        it "should not rescue prefetch executions" do
+          expect { transaction.prefetch_if_necessary(resource) }.to raise_error(Puppet::Error)
+        end
+      end
+
+      context "with future_features flag" do
+        before :each do
+          Puppet.settings[:future_features] = true
+        end
+
+        it "should rescue prefetch executions" do
+          transaction.prefetch_if_necessary(resource)
+
+          expect(transaction.prefetched_providers[:sshkey][:parsed]).to be_truthy
+        end
+
+        it "should mark resources as failed" do
+          transaction.evaluate
+
+          expect(transaction.resource_status(resource).failed?).to be_truthy
+        end
+
+        it "should mark a provider that has failed prefetch" do
+          transaction.prefetch_if_necessary(resource)
+
+          expect(transaction.prefetch_failed_providers[:sshkey][:parsed]).to be_truthy
+        end
+
+        describe "and new resources are generated" do
+          let(:generator) { Puppet::Type.type(:notify).new :title => "generator" }
+          let(:generated) do
+            %w[a b c].map { |name| Puppet::Type.type(:sshkey).new :title => "foo", :name => name, :type => :dsa, :key => "eh", :provider => :parsed }
+          end
+
+          before :each do
+            catalog.add_resource generator
+            generator.stubs(:generate).returns generated
+            catalog.stubs(:container_of).returns generator
+          end
+
+          it "should not evaluate resources with a failed provider, even if the prefetch is rescued" do
+            #Only the generator resource should be applied, all the other resources are failed, and skipped.
+            catalog.remove_resource resource2
+            transaction.expects(:apply).once
+
+            transaction.evaluate
+          end
+
+          it "should not fail other resources added after the failing resource" do
+            new_resource = Puppet::Type.type(:notify).new :name => "baz"
+            catalog.add_resource(new_resource)
+
+            transaction.evaluate
+
+            expect(transaction.resource_status(new_resource).failed?).to be_falsey
+          end
+
+          it "should fail other resources that require the failing resource" do
+            new_resource = Puppet::Type.type(:notify).new(:name => "baz", :require => resource)
+            catalog.add_resource(new_resource)
+
+            catalog.remove_resource resource2
+            transaction.expects(:apply).once
+
+            transaction.evaluate
+
+            expect(transaction.resource_status(resource).failed?).to be_truthy
+            expect(transaction.resource_status(new_resource).dependency_failed?).to be_truthy
+            expect(transaction.skip?(new_resource)).to be_truthy
+          end
+        end
+      end
+    end
   end
 
   describe "during teardown" do