From ecef4cd83b150ea39d43b8fd0264b2de57e1bc33 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 7 Jun 2024 20:19:27 +0200 Subject: [PATCH 1/2] Stop using apache::apache_version In cedd45b63be89ea54bd2a596e6cd3a3f60d4faf8 this was dropped and the whole module is now only for Apache 2.4+. This means the parameter is redundant. The parameter is kept in so this can be released in a bugfix release, but the next major version should drop it. Fixes: cedd45b63be89ea54bd2a596e6cd3a3f60d4faf8 ("Drop Apache 2.2 support") --- manifests/mod/lbmethod_bybusyness.pp | 10 +++------- manifests/mod/lbmethod_byrequests.pp | 10 +++------- manifests/mod/lbmethod_bytraffic.pp | 10 +++------- manifests/mod/lbmethod_heartbeat.pp | 10 +++------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/manifests/mod/lbmethod_bybusyness.pp b/manifests/mod/lbmethod_bybusyness.pp index 8578e95111..a30be11771 100644 --- a/manifests/mod/lbmethod_bybusyness.pp +++ b/manifests/mod/lbmethod_bybusyness.pp @@ -2,18 +2,14 @@ # Installs `lbmethod_bybusyness`. # # @param apache_version -# Version of Apache to install module on. +# Ignored, here for compatibility. # # @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bybusyness.html for additional documentation. # class apache::mod::lbmethod_bybusyness ( - Optional[String] $apache_version = $apache::apache_version, + Optional[String] $apache_version = undef, ) { require apache::mod::proxy_balancer - if versioncmp($apache_version, '2.3') >= 0 { - apache::mod { 'lbmethod_bybusyness': } - } else { - fail('Unsuported version for mod lbmethod_bybusyness') - } + apache::mod { 'lbmethod_bybusyness': } } diff --git a/manifests/mod/lbmethod_byrequests.pp b/manifests/mod/lbmethod_byrequests.pp index 012df4fbcb..f830e6d07f 100644 --- a/manifests/mod/lbmethod_byrequests.pp +++ b/manifests/mod/lbmethod_byrequests.pp @@ -2,18 +2,14 @@ # Installs `lbmethod_byrequests`. # # @param apache_version -# Version of Apache to install module on. +# Ignored, here for compatibility. # # @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html for additional documentation. # class apache::mod::lbmethod_byrequests ( - Optional[String] $apache_version = $apache::apache_version, + Optional[String] $apache_version = undef, ) { require apache::mod::proxy_balancer - if versioncmp($apache_version, '2.3') >= 0 { - apache::mod { 'lbmethod_byrequests': } - } else { - fail('Unsuported version for mod lbmethod_byrequests') - } + apache::mod { 'lbmethod_byrequests': } } diff --git a/manifests/mod/lbmethod_bytraffic.pp b/manifests/mod/lbmethod_bytraffic.pp index 058c630aef..d060d47194 100644 --- a/manifests/mod/lbmethod_bytraffic.pp +++ b/manifests/mod/lbmethod_bytraffic.pp @@ -2,18 +2,14 @@ # Installs `lbmethod_bytraffic`. # # @param apache_version -# Version of Apache to install module on. +# Ignored, here for compatibility. # # @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_bytraffic.html for additional documentation. # class apache::mod::lbmethod_bytraffic ( - Optional[String] $apache_version = $apache::apache_version, + Optional[String] $apache_version = undef, ) { require apache::mod::proxy_balancer - if versioncmp($apache_version, '2.3') >= 0 { - apache::mod { 'lbmethod_bytraffic': } - } else { - fail('Unsuported version for mod lbmethod_bytraffic') - } + apache::mod { 'lbmethod_bytraffic': } } diff --git a/manifests/mod/lbmethod_heartbeat.pp b/manifests/mod/lbmethod_heartbeat.pp index aa859d3a57..e58288b10f 100644 --- a/manifests/mod/lbmethod_heartbeat.pp +++ b/manifests/mod/lbmethod_heartbeat.pp @@ -2,18 +2,14 @@ # Installs `lbmethod_heartbeat`. # # @param apache_version -# Version of Apache to install module on. +# Ignored, here for compatibility. # # @see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html for additional documentation. # class apache::mod::lbmethod_heartbeat ( - Optional[String] $apache_version = $apache::apache_version, + Optional[String] $apache_version = undef, ) { require apache::mod::proxy_balancer - if versioncmp($apache_version, '2.3') >= 0 { - apache::mod { 'lbmethod_heartbeat': } - } else { - fail('Unsuported version for mod lbmethod_heartbeat') - } + apache::mod { 'lbmethod_heartbeat': } } From 4fbf14e192bf1b7936fe4f1f8d9a0ec591ab10d2 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 7 Jun 2024 20:23:53 +0200 Subject: [PATCH 2/2] Correct specs for lbmethod_* They missed the _spec suffix so they weren't executed. They're also simplified to stop setting the apache_version parameter since it's ignored anyway. --- spec/classes/mod/lbmethod_bybusyness.rb | 24 -------------------- spec/classes/mod/lbmethod_bybusyness_spec.rb | 16 +++++++++++++ spec/classes/mod/lbmethod_byrequests.rb | 24 -------------------- spec/classes/mod/lbmethod_byrequests_spec.rb | 16 +++++++++++++ spec/classes/mod/lbmethod_bytraffic.rb | 24 -------------------- spec/classes/mod/lbmethod_bytraffic_spec.rb | 16 +++++++++++++ spec/classes/mod/lbmethod_heartbeat.rb | 24 -------------------- spec/classes/mod/lbmethod_heartbeat_spec.rb | 16 +++++++++++++ 8 files changed, 64 insertions(+), 96 deletions(-) delete mode 100644 spec/classes/mod/lbmethod_bybusyness.rb create mode 100644 spec/classes/mod/lbmethod_bybusyness_spec.rb delete mode 100644 spec/classes/mod/lbmethod_byrequests.rb create mode 100644 spec/classes/mod/lbmethod_byrequests_spec.rb delete mode 100644 spec/classes/mod/lbmethod_bytraffic.rb create mode 100644 spec/classes/mod/lbmethod_bytraffic_spec.rb delete mode 100644 spec/classes/mod/lbmethod_heartbeat.rb create mode 100644 spec/classes/mod/lbmethod_heartbeat_spec.rb diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb deleted file mode 100644 index 2a54c8335e..0000000000 --- a/spec/classes/mod/lbmethod_bybusyness.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'apache::mod::lbmethod_byrequests', type: :class do - context 'on a Debian OS' do - include_examples 'Debian 11' - - context 'with Apache version >= 2.4' do - let :params do - { - apache_version: '2.4' - } - end - - it { - # rubocop:disable Layout/LineLength - expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', - 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") - # rubocop:enable Layout/LineLength - } - end - end -end diff --git a/spec/classes/mod/lbmethod_bybusyness_spec.rb b/spec/classes/mod/lbmethod_bybusyness_spec.rb new file mode 100644 index 0000000000..2cc5a9c6b0 --- /dev/null +++ b/spec/classes/mod/lbmethod_bybusyness_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'apache::mod::lbmethod_byrequests', type: :class do + context 'on a Debian OS' do + include_examples 'Debian 11' + + it { + # rubocop:disable Layout/LineLength + expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', + 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") + # rubocop:enable Layout/LineLength + } + end +end diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb deleted file mode 100644 index 2a54c8335e..0000000000 --- a/spec/classes/mod/lbmethod_byrequests.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'apache::mod::lbmethod_byrequests', type: :class do - context 'on a Debian OS' do - include_examples 'Debian 11' - - context 'with Apache version >= 2.4' do - let :params do - { - apache_version: '2.4' - } - end - - it { - # rubocop:disable Layout/LineLength - expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', - 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") - # rubocop:enable Layout/LineLength - } - end - end -end diff --git a/spec/classes/mod/lbmethod_byrequests_spec.rb b/spec/classes/mod/lbmethod_byrequests_spec.rb new file mode 100644 index 0000000000..2cc5a9c6b0 --- /dev/null +++ b/spec/classes/mod/lbmethod_byrequests_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'apache::mod::lbmethod_byrequests', type: :class do + context 'on a Debian OS' do + include_examples 'Debian 11' + + it { + # rubocop:disable Layout/LineLength + expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', + 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") + # rubocop:enable Layout/LineLength + } + end +end diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb deleted file mode 100644 index 2a54c8335e..0000000000 --- a/spec/classes/mod/lbmethod_bytraffic.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'apache::mod::lbmethod_byrequests', type: :class do - context 'on a Debian OS' do - include_examples 'Debian 11' - - context 'with Apache version >= 2.4' do - let :params do - { - apache_version: '2.4' - } - end - - it { - # rubocop:disable Layout/LineLength - expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', - 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") - # rubocop:enable Layout/LineLength - } - end - end -end diff --git a/spec/classes/mod/lbmethod_bytraffic_spec.rb b/spec/classes/mod/lbmethod_bytraffic_spec.rb new file mode 100644 index 0000000000..2cc5a9c6b0 --- /dev/null +++ b/spec/classes/mod/lbmethod_bytraffic_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'apache::mod::lbmethod_byrequests', type: :class do + context 'on a Debian OS' do + include_examples 'Debian 11' + + it { + # rubocop:disable Layout/LineLength + expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', + 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") + # rubocop:enable Layout/LineLength + } + end +end diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb deleted file mode 100644 index 2a54c8335e..0000000000 --- a/spec/classes/mod/lbmethod_heartbeat.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'apache::mod::lbmethod_byrequests', type: :class do - context 'on a Debian OS' do - include_examples 'Debian 11' - - context 'with Apache version >= 2.4' do - let :params do - { - apache_version: '2.4' - } - end - - it { - # rubocop:disable Layout/LineLength - expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', - 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") - # rubocop:enable Layout/LineLength - } - end - end -end diff --git a/spec/classes/mod/lbmethod_heartbeat_spec.rb b/spec/classes/mod/lbmethod_heartbeat_spec.rb new file mode 100644 index 0000000000..2cc5a9c6b0 --- /dev/null +++ b/spec/classes/mod/lbmethod_heartbeat_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'apache::mod::lbmethod_byrequests', type: :class do + context 'on a Debian OS' do + include_examples 'Debian 11' + + it { + # rubocop:disable Layout/LineLength + expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file', + 'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n") + # rubocop:enable Layout/LineLength + } + end +end