puppet 5.5.16 → 5.5.17

data/spec/unit/util/http_proxy_spec.rb

@@ -129,9 +129,32 @@ describe Puppet::Util::HttpProxy do
 
   end
 
+  describe ".no_proxy" do
+    no_proxy = '127.0.0.1, localhost'
+    it "should use a no_proxy list if set in environment" do
+      Puppet::Util.withenv('NO_PROXY' => no_proxy) do
+        expect(subject.no_proxy).to eq(no_proxy)
+      end
+    end
+
+    it "should use a no_proxy list if set in config" do
+      Puppet.settings[:no_proxy] = no_proxy
+      expect(subject.no_proxy).to eq(no_proxy)
+    end
+
+    it "should use environment variable before puppet settings" do
+      no_proxy_puppet_setting = '10.0.0.1, localhost'
+      Puppet::Util.withenv('NO_PROXY' => no_proxy) do
+        Puppet.settings[:no_proxy] = no_proxy_puppet_setting
+        expect(subject.no_proxy).to eq(no_proxy)
+      end
+    end
+  end
+
   describe ".no_proxy?" do
     no_proxy = '127.0.0.1, localhost, mydomain.com, *.otherdomain.com, oddport.com:8080, *.otheroddport.com:8080, .anotherdomain.com, .anotheroddport.com:8080'
-    it "should return false if no_proxy does not exist in env" do
+
+    it "should return false if no_proxy does not exist in environment or puppet settings" do
       Puppet::Util.withenv('no_proxy' => nil) do
         dest = 'https://puppetlabs.com'
         expect(subject.no_proxy?(dest)).to be false

data/spec/unit/util/log_spec.rb

@@ -178,7 +178,7 @@ describe Puppet::Util::Log do
       expect(logs.collect(&:message)).to include("Inner block", "Outer block")
     end
 
-    it 'includes backtrace for RuntimeError in log message when trace is enabled' do
+    it 'includes backtrace for RuntimeError in log message when trace option is passed' do
       logs = []
       destination = Puppet::Test::LogCollector.new(logs)
 
@@ -196,6 +196,32 @@ describe Puppet::Util::Log do
       expect(log.backtrace).to be_nil
     end
 
+    context "global options" do
+      around :each do |example|
+        Puppet[:trace] = true
+        example.run
+        Puppet[:trace] = false
+      end
+
+      it 'includes backtrace for RuntimeError in log message when trace is enabled globally' do
+        logs = []
+        destination = Puppet::Test::LogCollector.new(logs)
+
+        Puppet::Util::Log.newdestination(destination)
+        Puppet::Util::Log.with_destination(destination) do
+          begin
+            raise RuntimeError, 'Oops'
+          rescue RuntimeError => e
+            Puppet.log_exception(e, :default)
+          end
+        end
+        expect(logs.size).to eq(1)
+        log = logs[0]
+        expect(log.message).to match('/log_spec.rb')
+        expect(log.backtrace).to be_nil
+      end
+    end
+
     it 'excludes backtrace for RuntimeError in log message when trace is disabled' do
       logs = []
       destination = Puppet::Test::LogCollector.new(logs)

data/spec/unit/util/windows/service_spec.rb

@@ -41,6 +41,10 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     expect(subject::QUERY_SERVICE_CONFIGW).to receive(:new).and_return(query_return)
   end
 
+  def expect_successful_config_query2_and_return(param, query_return)
+    expect(param).to receive(:new).and_return(query_return)
+  end
+
   let(:subject)      { Puppet::Util::Windows::Service }
   let(:pointer) { double() }
   let(:mock_service_name) { double() }
@@ -50,7 +54,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
   before do
     allow(subject).to receive(:QueryServiceStatusEx).and_return(1)
     allow(subject).to receive(:QueryServiceConfigW).and_return(1)
+    allow(subject).to receive(:QueryServiceConfig2W).and_return(1)
     allow(subject).to receive(:ChangeServiceConfigW).and_return(1)
+    allow(subject).to receive(:ChangeServiceConfig2W).and_return(1)
     allow(subject).to receive(:OpenSCManagerW).and_return(scm)
     allow(subject).to receive(:OpenServiceW).and_return(service)
     allow(subject).to receive(:CloseServiceHandle)
@@ -576,6 +582,9 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
         }.each do |start_type_name, start_type|
           it "queries the service and returns the service start type #{start_type_name}" do
             expect_successful_config_query_and_return({:dwStartType => start_type})
+            if start_type_name == :SERVICE_AUTO_START
+              expect_successful_config_query2_and_return(subject::SERVICE_DELAYED_AUTO_START_INFO, {:fDelayedAutostart => 0})
+            end
             expect(subject.service_start_type(mock_service_name)).to eq(start_type_name)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 5.5.16
+  version: 5.5.17
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -239,9 +239,6 @@ files:
 - ext/suse/server.init
 - ext/systemd/puppet.service
 - ext/upload_facts.rb
-- ext/windows/eventlog/Rakefile
-- ext/windows/eventlog/puppetres.dll
-- ext/windows/eventlog/puppetres.mc
 - ext/windows/puppet_interactive.bat
 - ext/windows/puppet_shell.bat
 - ext/windows/run_puppet_interactive.bat
@@ -2704,8 +2701,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: puppet
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool

data/ext/windows/eventlog/Rakefile

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'fileutils'
-require 'rbconfig'
-
-BASENAME = "puppetres"
-
-task :default do
-  sh 'rake -T'
-end
-
-desc 'Build puppet eventlog message dll'
-task :dist => ['out', "#{BASENAME}.dll"]
-
-directory 'out'
-
-rule '.rc' => '.mc' do |t|
-  sh "mc -b -r out -h out #{t.source}"
-end
-
-rule '.res' => '.rc' do |t|
-  sh "rc -nologo -r -fo out/#{t.name} out/#{t.source}"
-end
-
-rule '.dll' => '.res' do |t|
-  sh "link -nologo -dll -noentry -machine:x86 -out:out/#{t.name} out/#{t.source}"
-end
-
-desc 'Delete generated files'
-task :clean do
-  FileUtils.rm_rf('out')
-end

data/ext/windows/eventlog/puppetres.mc

@@ -1,18 +0,0 @@
-MessageId=0x1
-SymbolicName=PUPPET_INFO
-Language=English
-%1
-.
-
-MessageId=0x2
-SymbolicName=PUPPET_WARN
-Language=English
-%1
-.
-
-MessageId=0x3
-SymbolicName=PUPPET_ERROR
-Language=English
-%1
-.
-