puppet 6.19.0-x64-mingw32 → 6.19.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e4357cafdc23fb83474814b2ce8a4fbd4975980171e3f973bd5df8ef542bba
-  data.tar.gz: '080c5f00f7ba8ea052e56b7619151344bed4eb316b54e0635046e6d56ffbc414'
+  metadata.gz: bebf7c1f070e9b926268d10514168aa9c980571fb38937cca7d0ecd453b46571
+  data.tar.gz: 5085ac016a244c154912c61e51d0f7c88e1d0795633087c60d51b1918f69549c
 SHA512:
-  metadata.gz: 7bf762c3a6772ddf89d3e4c2cb6b7b8167689a3a2b56e7008fff884d9fc8e7242b4f3087f3492faa400491c0725a676de8bc6c6860a644fa694497719d678b5e
-  data.tar.gz: '095a9120765d79a27b6dab5f346574e046226a5ea949049f263aadc5b2f04a991e83fd67a1b1407befd4ed8319d7dd0db73498739f0ccf807adf905bf8e549a9'
+  metadata.gz: 420e17e3874a6acd6429883fa2933c9128d4d0c8603df758a71cc51d9d00c58cc17f89a67d587516aba460a4fa56ed2a5c44a4c61772536c847215e519193f45
+  data.tar.gz: b059f4655feb7d7ef87a443116c28028bcf2a6c9d21222c89614a39014558e436871e3a5c743fe1b102d4949332b405121b8b640cab80095c87c84bd9386a08b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.19.0)
+    puppet (6.19.1)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -28,7 +28,7 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.4.4)
     docopt (0.6.1)
-    facter (4.0.43)
+    facter (4.0.44)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)

data/lib/puppet/settings.rb

@@ -385,6 +385,19 @@ class Puppet::Settings
     call_hooks_deferred_to_application_initialization
     issue_deprecations
 
+    run_mode = Puppet::Util::RunMode[self.preferred_run_mode]
+    if run_mode.agent? || run_mode.server?
+      if self.set_in_section?(:masterport, run_mode.name) && !self.set_in_section?(:serverport, run_mode.name)
+        self[:serverport] = self[:masterport]
+      elsif self.set_by_config?(:masterport) && !self.set_by_config?(:serverport)
+        self[:serverport] = self[:masterport]
+      elsif self.set_in_section?(:serverport, run_mode.name) && !self.set_in_section?(:masterport, run_mode.name)
+        self[:masterport] = self[:serverport]
+      elsif self.set_by_config?(:serverport) && !self.set_by_config?(:masterport)
+        self[:masterport] = self[:serverport]
+      end
+    end
+
     REQUIRED_APP_SETTINGS.each do |key|
       create_ancestors(Puppet[key])
     end
@@ -916,6 +929,16 @@ class Puppet::Settings
     end
   end
 
+  # Allow later inspection to determine if the setting was set by user
+  # config, rather than a default setting.
+  def set_in_section?(param, section)
+    param = param.to_sym
+    vals = searchpath_values(SearchPathElement.new(section, :section))
+    if vals
+      vals.lookup(param)
+    end
+  end
+
   # Patches the value for a param in a section.
   # This method is required to support the use case of unifying --dns-alt-names and
   # --dns_alt_names in the certificate face. Ideally this should be cleaned up.

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.19.0'
+  PUPPETVERSION = '6.19.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/settings_spec.rb

@@ -897,6 +897,144 @@ describe Puppet::Settings do
       expect(metadata(@settings.setting(:myfile))).to eq({:mode => "664"})
     end
 
+    context "when setting serverport and masterport" do
+      before(:each) do
+        default_values = {}
+        PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS.keys.each do |key|
+          default_values[key] = 'default value'
+        end
+        @settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
+        @settings.define_settings :server, :masterport => { :desc => "a", :default => 1000 }
+        @settings.define_settings :server, :serverport => { :desc => "a", :default => 1000 }
+        @settings.define_settings :server, :ca_port => { :desc => "a", :default => "$serverport" }
+        @settings.define_settings :server, :report_port => { :desc => "a", :default => "$serverport" }
+        expect(@settings).to receive(:read_file).and_return(text)
+        @settings.send(:parse_config_files)
+        @settings.initialize_app_defaults(default_values.merge(:run_mode => :agent))
+        expect(@settings.preferred_run_mode).to eq(:agent)
+      end
+
+      context 'with serverport in main and masterport in agent' do
+        let(:text) do
+          "[main]
+      serverport = 444
+      [agent]
+      masterport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with serverport and masterport in main' do
+        let(:text) do
+          "[main]
+      serverport = 445
+      masterport = 444
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with serverport and masterport in agent' do
+        let(:text) do
+          "[agent]
+      serverport = 445
+      masterport = 444
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with both serverport and masterport in main and agent' do
+        let(:text) do
+          "[main]
+      serverport = 447
+      masterport = 442
+      [agent]
+      serverport = 445
+      masterport = 444
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with serverport in agent and masterport in main' do
+        let(:text) do
+          "[agent]
+      serverport = 444
+      [main]
+      masterport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(444) }
+        it { expect(@settings[:ca_port]).to eq("444") }
+        it { expect(@settings[:report_port]).to eq("444") }
+      end
+
+      context 'with masterport in main' do
+        let(:text) do
+          "[main]
+      masterport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with masterport in agent' do
+        let(:text) do
+          "[agent]
+      masterport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with serverport in agent' do
+        let(:text) do
+          "[agent]
+      serverport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:masterport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+
+      context 'with serverport in main' do
+        let(:text) do
+          "[main]
+      serverport = 445
+      "
+        end
+
+        it { expect(@settings[:serverport]).to eq(445) }
+        it { expect(@settings[:masterport]).to eq(445) }
+        it { expect(@settings[:ca_port]).to eq("445") }
+        it { expect(@settings[:report_port]).to eq("445") }
+      end
+    end
+
     it "does not use the metadata from the same setting in a different section" do
       default_values = {}
       PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS.keys.each do |key|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.19.0
+  version: 6.19.1
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter