From ac50f8404fbd357e1dc4ddf4d3e1a2828b3b8448 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 1 Aug 2023 16:38:32 -1000 Subject: [PATCH] (maint) Drop unused master_agent_version variable --- manifests/params.pp | 8 -------- spec/classes/puppet_agent_osfamily_aix_spec.rb | 2 -- spec/classes/puppet_agent_osfamily_darwin_spec.rb | 5 ----- spec/classes/puppet_agent_osfamily_debian_spec.rb | 4 ---- spec/classes/puppet_agent_osfamily_redhat_spec.rb | 4 ---- spec/classes/puppet_agent_osfamily_solaris_spec.rb | 8 -------- spec/classes/puppet_agent_osfamily_suse_spec.rb | 4 ---- spec/classes/puppet_agent_osfamily_windows_spec.rb | 4 ---- spec/classes/puppet_agent_spec.rb | 12 ------------ spec/classes/puppet_agent_windows_install_spec.rb | 4 ---- 10 files changed, 55 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index d0563892..8eb90ad3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -69,17 +69,9 @@ else { $collection = 'puppet8' } - # The aio puppet-agent version currently installed on the compiling master - # (only used in PE) - if is_function_available('pe_compiling_server_aio_build') { - $master_agent_version = pe_compiling_server_aio_build() - } else { - $master_agent_version = undef - } } else { $_pe_version = undef $pe_repo_dir = undef - $master_agent_version = undef $collection = 'PC1' } } diff --git a/spec/classes/puppet_agent_osfamily_aix_spec.rb b/spec/classes/puppet_agent_osfamily_aix_spec.rb index 8993384a..3bbc24f4 100644 --- a/spec/classes/puppet_agent_osfamily_aix_spec.rb +++ b/spec/classes/puppet_agent_osfamily_aix_spec.rb @@ -35,7 +35,6 @@ before(:each) do Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) { |_args| '2000.0.0' } - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) { |_args| '1.10.100' } end it { is_expected.to contain_file('/opt/puppetlabs') } @@ -75,7 +74,6 @@ before(:each) do Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) { |_args| '2000.0.0' } - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) { |_args| '1.10.100' } end it { diff --git a/spec/classes/puppet_agent_osfamily_darwin_spec.rb b/spec/classes/puppet_agent_osfamily_darwin_spec.rb index 80f77cdd..cc9c5f7f 100644 --- a/spec/classes/puppet_agent_osfamily_darwin_spec.rb +++ b/spec/classes/puppet_agent_osfamily_darwin_spec.rb @@ -1,17 +1,12 @@ require 'spec_helper' describe 'puppet_agent' do - master_package_version = '1.10.100' before(:each) do # Need to mock the PE functions Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '2000.0.0' end - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - master_package_version - end - allow(Puppet::FileSystem).to receive(:exist?).and_call_original allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).and_call_original allow(Puppet::FileSystem).to receive(:exist?).with('/opt/puppetlabs/puppet/VERSION').and_return true diff --git a/spec/classes/puppet_agent_osfamily_debian_spec.rb b/spec/classes/puppet_agent_osfamily_debian_spec.rb index c88f665b..d29431e9 100644 --- a/spec/classes/puppet_agent_osfamily_debian_spec.rb +++ b/spec/classes/puppet_agent_osfamily_debian_spec.rb @@ -38,10 +38,6 @@ Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '2000.0.0' end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end end let(:facts) do diff --git a/spec/classes/puppet_agent_osfamily_redhat_spec.rb b/spec/classes/puppet_agent_osfamily_redhat_spec.rb index cc808a8d..b32a3f8a 100644 --- a/spec/classes/puppet_agent_osfamily_redhat_spec.rb +++ b/spec/classes/puppet_agent_osfamily_redhat_spec.rb @@ -168,10 +168,6 @@ Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '2000.0.0' end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - '5.5.4' - end end let(:facts) do diff --git a/spec/classes/puppet_agent_osfamily_solaris_spec.rb b/spec/classes/puppet_agent_osfamily_solaris_spec.rb index 067a9df5..bd6b4e7c 100644 --- a/spec/classes/puppet_agent_osfamily_solaris_spec.rb +++ b/spec/classes/puppet_agent_osfamily_solaris_spec.rb @@ -100,10 +100,6 @@ def install_script(ver, arch) pe_version end - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end - # Ensure we get a versionable package provider pkg = Puppet::Type.type(:package) allow(pkg).to receive(:defaultprovider).and_return(pkg.provider(:pkg)) @@ -310,10 +306,6 @@ def install_script(ver, arch) Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| pe_version end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end end let(:facts) do diff --git a/spec/classes/puppet_agent_osfamily_suse_spec.rb b/spec/classes/puppet_agent_osfamily_suse_spec.rb index a9289098..88e7a999 100644 --- a/spec/classes/puppet_agent_osfamily_suse_spec.rb +++ b/spec/classes/puppet_agent_osfamily_suse_spec.rb @@ -222,10 +222,6 @@ Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '2000.0.0' end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end end describe 'supported environment' do diff --git a/spec/classes/puppet_agent_osfamily_windows_spec.rb b/spec/classes/puppet_agent_osfamily_windows_spec.rb index e79f6c0a..dbfc0782 100644 --- a/spec/classes/puppet_agent_osfamily_windows_spec.rb +++ b/spec/classes/puppet_agent_osfamily_windows_spec.rb @@ -13,10 +13,6 @@ pe_version end - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end - allow(Puppet::Util).to receive(:absolute_path?).and_call_original allow(Puppet::Util).to receive(:absolute_path?).with(version_file).and_return true allow(Puppet::FileSystem).to receive(:exist?).and_call_original diff --git a/spec/classes/puppet_agent_spec.rb b/spec/classes/puppet_agent_spec.rb index 128e1380..eadc5eff 100644 --- a/spec/classes/puppet_agent_spec.rb +++ b/spec/classes/puppet_agent_spec.rb @@ -201,14 +201,6 @@ def global_facts(facts, os) end end - context 'package_version is undef if pe_compiling_server_aio_build is not defined' do - let(:facts) do - global_facts(facts, os).merge(is_pe: true) - end - - it { is_expected.to contain_class('puppet_agent').with_package_version(nil) } - end - context 'package_version is same as master when set to auto' do let(:params) { { package_version: 'auto' } } let(:node_params) { { serverversion: '7.6.5' } } @@ -268,10 +260,6 @@ def global_facts(facts, os) Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '2000.0.0' end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - '1.10.100' - end end end diff --git a/spec/classes/puppet_agent_windows_install_spec.rb b/spec/classes/puppet_agent_windows_install_spec.rb index d785620b..d4009ff4 100644 --- a/spec/classes/puppet_agent_windows_install_spec.rb +++ b/spec/classes/puppet_agent_windows_install_spec.rb @@ -33,10 +33,6 @@ Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args| '4.10.100' end - - Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args| - package_version - end end let(:facts) { facts.merge({ is_pe: true }) }