puppet 4.7.1 → 4.8.0

data/lib/puppet/version.rb

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

data/lib/puppet_x.rb

@@ -1,6 +1,12 @@
 # The Puppet Extensions Module.
 #
-# Submodules of this module should be named after the publisher (e.g. 'user' part of a Puppet Module name).
+# Submodules of this module should be named after the publisher (e.g.
+# 'user' part of a Puppet Module name). You should also add the module
+# name to avoid further conflicts in the same namespace. So the
+# structure should be
+# `lib/puppet_x/<namespace>/<module_name>/<extension.rb>`.
+# A Puppet Extension for 'puppetlabs-powershell' would live at
+# `lib/puppet_x/puppetlabs/powershell/<extension.rb>`.
 #
 # @api public
 #

data/spec/integration/application/apply_spec.rb

@@ -309,6 +309,124 @@ end
         expect(logs).to include(match(/doesn't match server specified environment/))
       end
     end
+  end
+
+  context 'when compiling a provided catalog with rich data and then applying from file' do
+    include PuppetSpec::Compiler
+
+    let(:env_dir) { tmpdir('environments') }
+    let(:execute) { 'include amod' }
+    let(:rich_data) { false }
+    let(:env_name) { 'spec' }
+    let(:populated_env_dir) do
+      dir_contained_in(env_dir, {
+        env_name => {
+          'modules' => {
+            'amod' => {
+              'manifests' => {
+                'init.pp' => <<-EOF
+class amod {
+  notify { rx: message => /[Rr]eg[Ee]xp/ }
+  notify { bin: message => Binary('w5ZzdGVuIG1lZCByw7ZzdGVuCg==') }
+  notify { ver: message  => SemVer('2.3.1') }
+  notify { vrange: message => SemVerRange('>=2.3.0') }
+  notify { tspan: message => Timespan(3600) }
+  notify { tstamp: message => Timestamp('2012-03-04T18:15:11.001') }
+}
+
+class amod::bad_type {
+  notify { bogus: message => amod::bogus() }
+}
+              EOF
+              },
+              'lib' => {
+                'puppet' => {
+                  'functions' => {
+                    'amod' => {
+                      'bogus.rb' => <<-RUBY
+                        # Function that leaks an object that is not recognized in the catalog
+                        Puppet::Functions.create_function(:'amod::bogus') do
+                          def bogus()
+                            Time.new(2016, 10, 6, 23, 51, 14, '+02:00')
+                          end
+                        end
+                      RUBY
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      })
+      env_dir
+    end
+
+    let(:env) { Puppet::Node::Environment.create(env_name.to_sym, [File.join(populated_env_dir, 'spec', 'modules')]) }
+    let(:node) { Puppet::Node.new('test', :environment => env) }
+
+    around(:each) do |example|
+      Puppet[:rich_data] = rich_data
+      Puppet.override(:loaders => Puppet::Pops::Loaders.new(env)) { example.run }
+    end
+
+    context 'and rich_data is set to false during compile' do
+      it 'will notify a string that is the result of Regexp#inspect (from Runtime3xConverter)' do
+        catalog = compile_to_catalog(execute, node)
+        apply = Puppet::Application[:apply]
+        apply.options[:catalog] = file_containing('manifest', catalog.to_pson)
+        apply.expects(:apply_catalog).with do |catalog|
+          catalog.resource(:notify, 'rx')['message'].is_a?(String)
+          catalog.resource(:notify, 'bin')['message'].is_a?(String)
+          catalog.resource(:notify, 'ver')['message'].is_a?(String)
+          catalog.resource(:notify, 'vrange')['message'].is_a?(String)
+          catalog.resource(:notify, 'tspan')['message'].is_a?(String)
+          catalog.resource(:notify, 'tstamp')['message'].is_a?(String)
+        end
+        apply.run
+      end
+
+      it 'will notify a string that is the result of to_s on uknown data types' do
+        logs = []
+        json = Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+           compile_to_catalog('include amod::bad_type', node).to_pson
+        end
+        logs = logs.select { |log| log.level == :warning }.map { |log| log.message }
+        expect(logs.empty?).to be_falsey
+        expect(logs[0]).to eql("Resource 'Notify[bogus]' contains a Time value. It will be converted to the String '2016-10-06 23:51:14 +0200'")
+
+        apply = Puppet::Application[:apply]
+        apply.options[:catalog] = file_containing('manifest', json)
+        apply.expects(:apply_catalog).with do |catalog|
+          catalog.resource(:notify, 'bogus')['message'].is_a?(String)
+        end
+        apply.run
+      end
+    end
+
+    context 'and rich_data is set to true during compile' do
+      let(:rich_data) { true }
+
+      it 'will notify a regexp using Regexp#to_s' do
+        catalog = compile_to_catalog(execute, node)
+        apply = Puppet::Application[:apply]
+        apply.options[:catalog] = file_containing('manifest', catalog.to_pson)
+        apply.expects(:apply_catalog).with do |catalog|
+          catalog.resource(:notify, 'rx')['message'].is_a?(Regexp)
+          catalog.resource(:notify, 'bin')['message'].is_a?(Puppet::Pops::Types::PBinaryType::Binary)
+          catalog.resource(:notify, 'ver')['message'].is_a?(Semantic::Version)
+          catalog.resource(:notify, 'vrange')['message'].is_a?(Semantic::VersionRange)
+          catalog.resource(:notify, 'tspan')['message'].is_a?(Puppet::Pops::Time::Timespan)
+          catalog.resource(:notify, 'tstamp')['message'].is_a?(Puppet::Pops::Time::Timestamp)
+        end
+        apply.run
+      end
+
+      it 'will raise an error on uknown data types' do
+        catalog = compile_to_catalog('include amod::bad_type', node)
+        expect { catalog.to_pson }.to raise_error(/No Puppet Type found for Time/)
+      end
+    end
 
   end
 end

data/spec/integration/parser/compiler_spec.rb

@@ -153,6 +153,25 @@ describe Puppet::Parser::Compiler do
     end
   end
 
+  context 'when working with $settings name space' do
+    include PuppetSpec::Compiler
+    it 'makes $settings::strict available as string' do
+      node = Puppet::Node.new("testing")
+      catalog = compile_to_catalog(<<-MANIFEST, node)
+          notify { 'test': message => $settings::strict == 'warning' }
+      MANIFEST
+      expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
+    end
+
+    it 'can return boolean settings as Boolean' do
+      node = Puppet::Node.new("testing")
+      catalog = compile_to_catalog(<<-MANIFEST, node)
+          notify { 'test': message => $settings::storeconfigs == false }
+      MANIFEST
+      expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
+    end
+  end
+
   context 'when working with $server_facts' do
     include PuppetSpec::Compiler
     context 'and have opted in to trusted_server_facts' do
@@ -206,6 +225,15 @@ describe Puppet::Parser::Compiler do
             notify { 'test': message => $server_facts == 'changed' }
         MANIFEST
 
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
+      end
+      it 'should warn about assignment to $server_facts' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+            $server_facts = 'changed'
+            notify { 'test': message => $server_facts == 'changed' }
+        MANIFEST
+        expect(@logs).to have_matching_log(/Assignment to \$server_facts is deprecated/)
+
         expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
       end
     end

data/spec/integration/parser/pcore_resource_spec.rb

@@ -37,9 +37,9 @@ describe 'when pcore described resources types are in use' do
              } }
           },
         },
-        'm2' => { 
+        'm2' => {
           'lib' => { 'puppet' => { 'type' => {
-            'test2.rb' => <<-EOF
+            'test2.rb' => <<-EOF,
             module Puppet
             Type.newtype(:test2) do
               @doc = "Docs for resource"
@@ -57,6 +57,16 @@ describe 'when pcore described resources types are in use' do
               end
             end;end
             EOF
+            'cap.rb' => <<-EOF
+            module Puppet
+            Type.newtype(:cap, :is_capability => true) do
+              @doc = "Docs for capability"
+              @isomorphic = false
+              newproperty(:message) do
+                desc "Docs for 'message' property"
+              end
+            end;end
+            EOF
            } } },
         }
       }}})
@@ -102,14 +112,18 @@ describe 'when pcore described resources types are in use' do
         test2 { 'b':
           message => 'b works'
         }
+        cap { 'c':
+          message => 'c works'
+        }
       MANIFEST
       expect(catalog.resource(:test1, "a")['message']).to eq('a works')
       expect(catalog.resource(:test2, "b")['message']).to eq('b works')
+      expect(catalog.resource(:cap, "c")['message']).to eq('c works')
     end
 
     it 'the validity of attribute names are checked' do
       genface.types
-      expect do 
+      expect do
         compile_to_catalog(<<-MANIFEST)
           test1 { 'a':
             mezzage => 'a works'
@@ -129,6 +143,20 @@ describe 'when pcore described resources types are in use' do
       expect(catalog.resource(:test1, "a")['noop']).to eq(true)
     end
 
+    it 'capability is propagated to the catalog' do
+      genface.types
+      catalog = compile_to_catalog(<<-MANIFEST)
+        test2 { 'r':
+          message => 'a resource'
+        }
+        cap { 'c':
+          message => 'a cap'
+        }
+      MANIFEST
+      expect(catalog.resource(:test2, "r").is_capability?).to eq(false)
+      expect(catalog.resource(:cap, "c").is_capability?).to eq(true)
+    end
+
     it 'a generated type describes if it is isomorphic' do
       generate_and_in_a_compilers_context do |compiler|
         t1 = find_resource_type(compiler.topscope, 'test1')
@@ -138,6 +166,15 @@ describe 'when pcore described resources types are in use' do
       end
     end
 
+    it 'a generated type describes if it is a capability' do
+      generate_and_in_a_compilers_context do |compiler|
+        t1 = find_resource_type(compiler.topscope, 'test1')
+        expect(t1.is_capability?).to be(false)
+        t2 = find_resource_type(compiler.topscope, 'cap')
+        expect(t2.is_capability?).to be(true)
+      end
+    end
+
     it 'a generated type returns parameters defined in pcore' do
       generate_and_in_a_compilers_context do |compiler|
         t1 = find_resource_type(compiler.topscope, 'test1')

data/spec/integration/provider/mount_spec.rb

@@ -149,9 +149,10 @@ describe "mount provider (integration)", :unless => Puppet.features.microsoft_wi
       pending "Due to bug 6309"
       @mounted = true
       @current_device = "/dev/disk2s2"
+      @current_options = "local"
       create_fake_fstab(true)
       @desired_options = "local"
-      run_in_catalog(:ensure=>:mounted, :options=>'local')
+      run_in_catalog(:ensure=>:mounted, :options=>'msdos,local')
       expect(@current_device).to eq("/dev/disk1s1")
       expect(@mounted).to eq(true)
       expect(@current_options).to eq('local')

data/spec/integration/util/windows/principal_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
   let (:system_bytes) { [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0] }
   let (:null_sid_bytes) { bytes = [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }
   let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
-  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_sid_object(Puppet::Util::Windows::ADSI.computer_name) }
+  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_sid_object(Socket.gethostname) }
   # BUILTIN is localized on German Windows, but not French
   # looking this up like this dilutes the values of the tests as we're comparing two mechanisms
   # for returning the same values, rather than to a known good
@@ -64,7 +64,7 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       # otherwise running in AppVeyor there is no Administrator and a the current local user can be used
       skip if (running_as_system && !user_exists)
 
-      hostname = Puppet::Util::Windows::ADSI.computer_name
+      hostname = Socket.gethostname
 
       principal = Puppet::Util::Windows::SID::Principal.lookup_account_name("#{hostname}\\#{username}")
       expect(principal.account).to match(/^#{Regexp.quote(username)}$/i)

data/spec/integration/util/windows/registry_spec.rb

@@ -129,7 +129,7 @@ describe Puppet::Util::Windows::Registry do
 
       let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
       let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let (:subkey_name) { "PuppetRegistryTest" }
       let (:guid) { SecureRandom.uuid }
       let (:regsam) { Puppet::Util::Windows::Registry::KEY32 }
 
@@ -187,7 +187,7 @@ describe Puppet::Util::Windows::Registry do
     context "when reading values" do
       let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
       let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let (:subkey_name) { "PuppetRegistryTest" }
       let (:value_name) { SecureRandom.uuid }
 
       after(:each) do
@@ -228,7 +228,7 @@ describe Puppet::Util::Windows::Registry do
     context "when reading corrupt values" do
       let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
       let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let (:subkey_name) { "PuppetRegistryTest" }
       let (:value_name) { SecureRandom.uuid }
 
       before(:each) do
@@ -254,4 +254,4 @@ describe Puppet::Util::Windows::Registry do
     end
   end
 end
-end
+end

data/spec/lib/puppet_spec/compiler.rb

@@ -59,8 +59,12 @@ module PuppetSpec::Compiler
     logs
   end
 
-  def eval_and_collect_notices(code, node = Puppet::Node.new('foonode'))
+  def eval_and_collect_notices(code, node = Puppet::Node.new('foonode'), topscope_vars = {})
     collect_notices(code, node) do |compiler|
+      unless topscope_vars.empty?
+        scope = compiler.topscope
+        topscope_vars.each {|k,v| scope.setvar(k, v) }
+      end
       if block_given?
         compiler.compile do |catalog|
           yield(compiler.topscope, catalog)

data/spec/lib/puppet_spec/unindent.rb

@@ -0,0 +1,5 @@
+class String
+  def unindent
+    gsub(/^#{scan(/^\s*/).min_by{ |l| l.length }}/, '')
+  end
+end

data/spec/shared_contexts/types_setup.rb

@@ -34,6 +34,10 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTypeAliasType,
       Puppet::Pops::Types::PSemVerType,
       Puppet::Pops::Types::PSemVerRangeType,
+      Puppet::Pops::Types::PTimespanType,
+      Puppet::Pops::Types::PTimestampType,
+      Puppet::Pops::Types::PSensitiveType,
+      Puppet::Pops::Types::PBinaryType,
     ]
   end
 
@@ -51,6 +55,8 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PEnumType,
       Puppet::Pops::Types::PSemVerType,
       Puppet::Pops::Types::PSemVerRangeType,
+      Puppet::Pops::Types::PTimespanType,
+      Puppet::Pops::Types::PTimestampType,
     ]
   end
 

data/spec/shared_examples/rhel_package_provider.rb

@@ -125,6 +125,22 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
         provider.stubs(:query).returns(:ensure => current_version).then.returns(:ensure => version)
         provider.install
       end
+      it 'should not run upgrade command if absent and ensure latest' do
+        current_version = ''
+        version = '1.2'
+        resource[:ensure] = :latest
+        Puppet::Util::Execution.expects(:execute).with(["/usr/bin/#{provider_name}", '-d', '0', '-e', error_level, '-y', :install, name])
+        provider.stubs(:query).returns(:ensure => current_version).then.returns(:ensure => version)
+        provider.install
+      end
+      it 'should run upgrade command if present and ensure latest' do
+        current_version = '1.0'
+        version = '1.2'
+        resource[:ensure] = :latest
+        Puppet::Util::Execution.expects(:execute).with(["/usr/bin/#{provider_name}", '-d', '0', '-e', error_level, '-y', upgrade_command, name])
+        provider.stubs(:query).returns(:ensure => current_version).then.returns(:ensure => version)
+        provider.install
+      end
       it 'should accept install options' do
         resource[:ensure] = :installed
         resource[:install_options] = ['-t', {'-x' => 'expackage'}]

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ require 'puppet_spec/files'
 require 'puppet_spec/settings'
 require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
+require 'puppet_spec/unindent'
 require 'puppet/test/test_helper'
 
 Pathname.glob("#{dir}/shared_contexts/*.rb") do |file|

data/spec/unit/agent_spec.rb

@@ -63,6 +63,17 @@ describe Puppet::Agent do
     @agent.run
   end
 
+  it "should initialize the client's transaction_uuid if passed as a client_option" do
+    client = mock 'client'
+    transaction_uuid = 'foo'
+    AgentTestClient.expects(:new).with(anything, transaction_uuid).returns client
+
+    client.expects(:run)
+
+    @agent.stubs(:disabled?).returns false
+    @agent.run(:transaction_uuid => transaction_uuid)
+  end
+
   it "should be considered running if the lock file is locked" do
     lockfile = mock 'lockfile'
 

data/spec/unit/application/lookup_spec.rb

@@ -162,12 +162,14 @@ describe Puppet::Application::Lookup do
       end
     end
 
-    it '--explain produces human readable text by default' do
+    it '--explain produces human readable text by default and does not produce output to debug logger' do
       lookup.options[:node] = node
       lookup.options[:explain] = true
       lookup.command_line.stubs(:args).returns(['a'])
+      logs = []
       begin
-        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
 Merge strategy first
   Data Binding "hiera"
     No such key: "a"
@@ -179,12 +181,54 @@ Merge strategy first
         Found key: "a" value: "This is A"
   Merged result: "This is A"
         EXPLANATION
+          end
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
+      expect(logs.any? { |log| log.level == :debug }).to be_falsey
+    end
+
+    it '--explain produces human readable text by default and --debug produces the same output to debug logger' do
+      lookup.options[:node] = node
+      lookup.options[:explain] = true
+      lookup.command_line.stubs(:args).returns(['a'])
+      Puppet.debug = true
+      logs = []
+      begin
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+Merge strategy first
+  Data Binding "hiera"
+    No such key: "a"
+  Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+    Data Provider "common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common"
+        Found key: "a" value: "This is A"
+  Merged result: "This is A"
+          EXPLANATION
+        end
       rescue SystemExit => e
         expect(e.status).to eq(0)
       end
+      logs = logs.select { |log| log.level == :debug }.map { |log| log.message }
+      expect(logs).to include(<<-EXPLANATION.chomp)
+Lookup of 'a'
+  Merge strategy first
+    Data Binding "hiera"
+      No such key: "a"
+    Data Provider "Hiera Data Provider, version 4"
+      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+      Data Provider "common"
+        Path "#{environmentpath}/production/data/common.yaml"
+          Original path: "common"
+          Found key: "a" value: "This is A"
+    Merged result: "This is A"
+      EXPLANATION
     end
 
-    it '--explain produces human readable text of a hash merge when using --explain-options' do
+    it '--explain-options produces human readable text of a hash merge' do
       lookup.options[:node] = node
       lookup.options[:explain_options] = true
       begin
@@ -209,6 +253,53 @@ Merge strategy hash
       end
     end
 
+    it '--explain-options produces human readable text of a hash merge and --debug produces the same output to debug logger' do
+      lookup.options[:node] = node
+      lookup.options[:explain_options] = true
+      Puppet.debug = true
+      logs = []
+      begin
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+Merge strategy hash
+  Data Binding "hiera"
+    No such key: "lookup_options"
+  Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+    Data Provider "common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common"
+        Found key: "lookup_options" value: {
+          "a" => "first"
+        }
+  Merged result: {
+    "a" => "first"
+  }
+          EXPLANATION
+        end
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
+      logs = logs.select { |log| log.level == :debug }.map { |log| log.message }
+      expect(logs).to include(<<-EXPLANATION.chomp)
+Lookup of '__global__'
+  Merge strategy hash
+    Data Binding "hiera"
+      No such key: "lookup_options"
+    Data Provider "Hiera Data Provider, version 4"
+      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+      Data Provider "common"
+        Path "#{environmentpath}/production/data/common.yaml"
+          Original path: "common"
+          Found key: "lookup_options" value: {
+            "a" => "first"
+          }
+    Merged result: {
+      "a" => "first"
+    }
+      EXPLANATION
+    end
+
     it '--explain produces human readable text of a hash merge when using both --explain and --explain-options' do
       lookup.options[:node] = node
       lookup.options[:explain] = true