puppet 4.1.0 → 4.10.0

data/spec/unit/semver_spec.rb

@@ -212,6 +212,247 @@ describe SemVer do
       expect(version.tiny).to    eq(5)
       expect(version.special).to eq('-beta6')
     end
+
+    context 'should not log a deprecation warning when strict == off' do
+      before(:each) { Puppet[:strict] = :off }
+
+      it 'on new instance' do
+        SemVer.new('1.2.3')
+        expect(@logs).to be_empty
+      end
+
+      it 'on exact range' do
+        SemVer['1.2.3']
+        expect(@logs).to be_empty
+      end
+
+      it 'on simple range' do
+        SemVer['1.2.x']
+        expect(@logs).to be_empty
+      end
+
+      it 'on tilde range' do
+        SemVer['~1.2.0']
+        expect(@logs).to be_empty
+      end
+
+      it 'on from-to range' do
+        SemVer['1.2.0-1.3.0']
+        expect(@logs).to be_empty
+      end
+
+      it 'on >= range' do
+        SemVer['>=1.2.0']
+        expect(@logs).to be_empty
+      end
+
+      it 'on <= range' do
+        SemVer['<=1.2.0']
+        expect(@logs).to be_empty
+      end
+
+      it 'on > range' do
+        SemVer['>1.2.0']
+        expect(@logs).to be_empty
+      end
+
+      it 'on > range' do
+        SemVer['<1.2.0']
+        expect(@logs).to be_empty
+      end
+    end
+
+    context 'should log a deprecation warning when strict == warning' do
+      before(:each) { Puppet[:strict] = :warning }
+
+      it 'on new instance' do
+        SemVer.new('1.2.3')
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on exact range' do
+        SemVer['1.2.3']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on simple range' do
+        SemVer['1.2.x']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on tilde range' do
+        SemVer['~1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on from-to range' do
+        SemVer['1.2.0 - 1.3.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on >= range' do
+        SemVer['>=1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on <= range' do
+        SemVer['<=1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on > range' do
+        SemVer['>1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on > range' do
+        SemVer['<1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      context 'unless suppressed by argument' do
+        it 'on new instance' do
+          SemVer.new('1.2.3', true)
+          expect(@logs).to be_empty
+        end
+
+        it 'on exact range' do
+          SemVer['1.2.3', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on simple range' do
+          SemVer['1.2.x', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on tilde range' do
+          SemVer['~1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on from-to range' do
+          SemVer['1.2.0 - 1.3.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on >= range' do
+          SemVer['>=1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on <= range' do
+          SemVer['<=1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on > range' do
+          SemVer['>1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on > range' do
+          SemVer['<1.2.0', true]
+          expect(@logs).to be_empty
+        end
+      end
+    end
+
+    context 'should log a deprecation warning when strict == error' do
+      before(:each) { Puppet[:strict] = :error }
+
+      it 'on new instance' do
+        SemVer.new('1.2.3')
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on exact range' do
+        SemVer['1.2.3']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on simple range' do
+        SemVer['1.2.x']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on tilde range' do
+        SemVer['~1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on from-to range' do
+        SemVer['1.2.0 - 1.3.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on >= range' do
+        SemVer['>=1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on <= range' do
+        SemVer['<=1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on > range' do
+        SemVer['>1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      it 'on > range' do
+        SemVer['<1.2.0']
+        expect(@logs.map(&:message)).to include(/Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead/)
+      end
+
+      context 'unless suppressed by argument' do
+        it 'on new instance' do
+          SemVer.new('1.2.3', true)
+          expect(@logs).to be_empty
+        end
+
+        it 'on exact range' do
+          SemVer['1.2.3', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on simple range' do
+          SemVer['1.2.x', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on tilde range' do
+          SemVer['~1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on from-to range' do
+          SemVer['1.2.0 - 1.3.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on >= range' do
+          SemVer['>=1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on <= range' do
+          SemVer['<=1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on > range' do
+          SemVer['>1.2.0', true]
+          expect(@logs).to be_empty
+        end
+
+        it 'on > range' do
+          SemVer['<1.2.0', true]
+          expect(@logs).to be_empty
+        end
+      end
+    end
   end
 
   describe '#matched_by?' do

data/spec/unit/settings/environment_conf_spec.rb

@@ -39,6 +39,19 @@ describe Puppet::Settings::EnvironmentConf do
       expect(envconf.environment_timeout).to eq(180)
     end
 
+    it "reads a static_catalogs from config" do
+      setup_environment_conf(config, :static_catalogs => true)
+
+      expect(envconf.static_catalogs).to eq(true)
+    end
+
+    it "can retrieve untruthy settings" do
+      Puppet[:static_catalogs] = true
+      setup_environment_conf(config, :static_catalogs => false)
+
+      expect(envconf.static_catalogs).to eq(false)
+    end
+
     it "can retrieve raw settings" do
       setup_environment_conf(config, :manifest => 'manifest.pp')
 
@@ -64,10 +77,14 @@ describe Puppet::Settings::EnvironmentConf do
       expect(envconf.config_version).to be_nil
     end
 
-    it "returns a defult of 0 for environment_timeout when config has none" do
+    it "returns a default of 0 for environment_timeout when config has none" do
       expect(envconf.environment_timeout).to eq(0)
     end
 
+    it "returns default of true for static_catalogs when config has none" do
+      expect(envconf.static_catalogs).to eq(true)
+    end
+
     it "can still retrieve raw setting" do
       expect(envconf.raw_setting(:manifest)).to be_nil
     end

data/spec/unit/settings/file_setting_spec.rb

@@ -169,6 +169,12 @@ describe Puppet::Settings::FileSetting do
       expect(resource.title).to eq(@basepath)
     end
 
+    it "should have a working directory with a root directory not called dev", :if => Puppet.features.microsoft_windows? do
+      # Although C:\Dev\.... is a valid path on Windows, some other code may regard it as a path to be ignored.  e.g. /dev/null resolves to C:\dev\null on Windows.
+      path = File.expand_path('somefile')
+      expect(path).to_not match(/^[A-Z]:\/dev/i)
+    end
+
     it "should fully qualified returned files if necessary (#795)" do
       @settings.stubs(:value).with(:myfile, nil, false).returns "myfile"
       path = File.expand_path('myfile')
@@ -295,4 +301,35 @@ describe Puppet::Settings::FileSetting do
       expect(filesetting.munge(':memory:')).to eq(':memory:')
     end
   end
+
+  context "when opening", :unless => Puppet.features.microsoft_windows? do
+    let(:path) do
+      tmpfile('file_setting_spec')
+    end
+
+    let(:setting) do
+      settings = mock("settings", :value => path)
+      FileSetting.new(:name => :mysetting, :desc => "creates a file", :settings => settings)
+    end
+
+    it "creates a file with mode 0640" do
+      setting.mode = '0640'
+
+      expect(File).to_not be_exist(path)
+      setting.open('w')
+
+      expect(File).to be_exist(path)
+      expect(Puppet::FileSystem.stat(path).mode & 0777).to eq(0640)
+    end
+
+    it "preserves the mode of an existing file" do
+      setting.mode = '0640'
+
+      Puppet::FileSystem.touch(path)
+      Puppet::FileSystem.chmod(0644, path)
+      setting.open('w')
+
+      expect(Puppet::FileSystem.stat(path).mode & 0777).to eq(0644)
+    end
+  end
 end

data/spec/unit/settings/ini_file_spec.rb

@@ -4,6 +4,13 @@ require 'stringio'
 require 'puppet/settings/ini_file'
 
 describe Puppet::Settings::IniFile do
+  # different UTF-8 widths
+  # 1-byte A
+  # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+  # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+  # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+  let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ𠜎
+
   it "preserves the file when no changes are made" do
     original_config = <<-CONFIG
     # comment
@@ -27,6 +34,16 @@ describe Puppet::Settings::IniFile do
     expect(config_fh.string).to eq "[the_section]\nname = value\n"
   end
 
+  it "adds a UTF-8 name and value to an empty file" do
+    config_fh = a_config_file_containing("")
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("the_section", mixed_utf8, mixed_utf8.reverse)
+    end
+
+    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
     config_fh = a_config_file_containing(<<-CONF)
     [section]
@@ -45,6 +62,22 @@ name = value
     CONF
   end
 
+  it "can update values within a UTF-8 section of an existing file" do
+    config_fh = a_config_file_containing(<<-CONF)
+    [#{mixed_utf8}]
+    foo = default
+    CONF
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set(mixed_utf8, 'foo', 'bar')
+    end
+
+    expect(config_fh.string).to eq(<<-CONF)
+    [#{mixed_utf8}]
+    foo = bar
+    CONF
+  end
+
   it "preserves comments when writing a new name and value" do
     config_fh = a_config_file_containing("# this is a comment")
 
@@ -75,6 +108,29 @@ name = value
     CONFIG
   end
 
+  it "updates existing UTF-8 name / values in place" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    # this is the preceding comment
+     [section]
+    ascii = foo
+    #{mixed_utf8} = bar
+    # this is the trailing comment
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "ascii", mixed_utf8)
+      config.set("section", mixed_utf8, mixed_utf8.reverse)
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    # this is the preceding comment
+     [section]
+    ascii = #{mixed_utf8}
+    #{mixed_utf8} = #{mixed_utf8.reverse}
+    # this is the trailing comment
+    CONFIG
+  end
+
   it "updates only the value in the selected section" do
     config_fh = a_config_file_containing(<<-CONFIG)
     [other_section]
@@ -179,6 +235,7 @@ updated = new
   end
 
   def a_config_file_containing(text)
-    StringIO.new(text)
+    # set_encoding required for Ruby 1.9.3 as ASCII is the default
+    StringIO.new(text).set_encoding(Encoding::UTF_8)
   end
 end

data/spec/unit/settings_spec.rb

@@ -44,7 +44,7 @@ describe Puppet::Settings do
     it "should not allow specification of default values associated with a section as an array" do
       expect {
         @settings.define_settings(:section, :myvalue => ["defaultval", "my description"])
-      }.to raise_error
+      }.to raise_error(ArgumentError, /setting definition for 'myvalue' is not a hash!/)
     end
 
     it "should not allow duplicate parameter specifications" do
@@ -287,6 +287,95 @@ describe Puppet::Settings do
       expect(@settings.set_by_cli?(:myval)).to be_falsey
     end
 
+    it "should find no configured settings by default" do
+      expect(@settings.set_by_config?(:myval)).to be_falsey
+    end
+
+    it "should identify configured settings in memory" do
+      @settings.instance_variable_get(:@value_sets)[:memory].expects(:lookup).with(:myval).returns('foo')
+      expect(@settings.set_by_config?(:myval)).to be_truthy
+    end
+
+    it "should identify configured settings from CLI" do
+      @settings.instance_variable_get(:@value_sets)[:cli].expects(:lookup).with(:myval).returns('foo')
+      expect(@settings.set_by_config?(:myval)).to be_truthy
+    end
+
+    it "should not identify configured settings from environment by default" do
+      Puppet.lookup(:environments).expects(:get_conf).with(Puppet[:environment].to_sym).never
+      expect(@settings.set_by_config?(:manifest)).to be_falsey
+    end
+
+    it "should identify configured settings from environment by when an environment is specified" do
+      foo = mock('environment', :manifest => 'foo')
+      Puppet.lookup(:environments).expects(:get_conf).with(Puppet[:environment].to_sym).returns(foo)
+      expect(@settings.set_by_config?(:manifest, Puppet[:environment])).to be_truthy
+    end
+
+    it "should identify configured settings from the preferred run mode" do
+      user_config_text = "[#{@settings.preferred_run_mode}]\nmyval = foo"
+      seq = sequence "config_file_sequence"
+
+      Puppet.features.stubs(:root?).returns(false)
+      Puppet::FileSystem.expects(:exist?).
+        with(user_config_file_default_location).
+        returns(true).in_sequence(seq)
+      @settings.expects(:read_file).
+        with(user_config_file_default_location).
+        returns(user_config_text).in_sequence(seq)
+
+      @settings.send(:parse_config_files)
+      expect(@settings.set_by_config?(:myval)).to be_truthy
+    end
+
+    it "should identify configured settings from the specified run mode" do
+      user_config_text = "[master]\nmyval = foo"
+      seq = sequence "config_file_sequence"
+
+      Puppet.features.stubs(:root?).returns(false)
+      Puppet::FileSystem.expects(:exist?).
+        with(user_config_file_default_location).
+        returns(true).in_sequence(seq)
+      @settings.expects(:read_file).
+        with(user_config_file_default_location).
+        returns(user_config_text).in_sequence(seq)
+
+      @settings.send(:parse_config_files)
+      expect(@settings.set_by_config?(:myval, nil, :master)).to be_truthy
+    end
+
+    it "should not identify configured settings from an unspecified run mode" do
+      user_config_text = "[zaz]\nmyval = foo"
+      seq = sequence "config_file_sequence"
+
+      Puppet.features.stubs(:root?).returns(false)
+      Puppet::FileSystem.expects(:exist?).
+        with(user_config_file_default_location).
+        returns(true).in_sequence(seq)
+      @settings.expects(:read_file).
+        with(user_config_file_default_location).
+        returns(user_config_text).in_sequence(seq)
+
+      @settings.send(:parse_config_files)
+      expect(@settings.set_by_config?(:myval)).to be_falsey
+    end
+
+    it "should identify configured settings from the main section" do
+      user_config_text = "[main]\nmyval = foo"
+      seq = sequence "config_file_sequence"
+
+      Puppet.features.stubs(:root?).returns(false)
+      Puppet::FileSystem.expects(:exist?).
+        with(user_config_file_default_location).
+        returns(true).in_sequence(seq)
+      @settings.expects(:read_file).
+        with(user_config_file_default_location).
+        returns(user_config_text).in_sequence(seq)
+
+      @settings.send(:parse_config_files)
+      expect(@settings.set_by_config?(:myval)).to be_truthy
+    end
+
     it "should clear the cache when setting getopt-specific values" do
       @settings.define_settings :mysection,
           :one => { :default => "whah", :desc => "yay" },
@@ -648,7 +737,7 @@ describe Puppet::Settings do
 
       Puppet::FileSystem.expects(:exist?).with(myfile).returns(true)
 
-      Puppet::FileSystem.expects(:read).with(myfile).returns "[main]"
+      Puppet::FileSystem.expects(:read).with(myfile, :encoding => 'utf-8').returns "[main]"
 
       @settings.send(:parse_config_files)
     end
@@ -1286,8 +1375,21 @@ describe Puppet::Settings do
     end
 
     describe "when adding users and groups to the catalog" do
+      before :all do
+        # when this spec is run in isolation to build a settings catalog
+        # it will not be able to autorequire and load types for the first time
+        # on Windows with microsoft_windows? stubbed to false, because
+        # Puppet::Util.path_to_uri is called to generate a URI to load code
+        # and it manipulates the path based on OS
+        # so instead we forcefully "prime" the cached types
+        Puppet::Type.type(:user).new(:name => 'foo')
+        Puppet::Type.type(:group).new(:name => 'bar')
+        Puppet::Type.type(:file).new(:name => Dir.pwd) # appropriate for OS
+      end
+
       before do
         Puppet.features.stubs(:root?).returns true
+        # stubbed to false, as Windows catalogs don't add users / groups
         Puppet.features.stubs(:microsoft_windows?).returns false
 
         @settings.define_settings :foo,
@@ -1734,7 +1836,7 @@ describe Puppet::Settings do
   end
 
   describe "default_certname" do
-    describe "using hostname and domainname" do
+    describe "using hostname and domain" do
       before :each do
         Puppet::Settings.stubs(:hostname_fact).returns("testhostname")
         Puppet::Settings.stubs(:domain_fact).returns("domain.test.")

data/spec/unit/ssl/base_spec.rb

@@ -45,6 +45,15 @@ describe Puppet::SSL::Certificate do
     end
   end
 
+  describe "when initializing wrapped class from a file with #read" do
+    it "should open the file with ASCII encoding" do
+      path = '/foo/bar/cert'
+      Puppet::SSL::Base.stubs(:valid_certname).returns(true)
+      Puppet::FileSystem.expects(:read).with(path, :encoding => Encoding::ASCII).returns("bar")
+      @base.read(path)
+    end
+  end
+
   describe "#digest_algorithm" do
     let(:content) { stub 'content' }
     let(:base) {