refactor: remove RHEL 7 TODOs and fix mod_ssl spec

RHEL 7 is EOL. Simplify helpers by removing version guards. Replace

commented-out mod_ssl spec with a working test.

Author: damacus

libraries/helpers.rb

@@ -119,10 +119,6 @@ def perl_pkg
 
       def default_apache_pkg
         case node['platform_family']
-        when 'amazon'
-          'httpd'
-        when 'rhel'
-          'httpd'
         when 'debian', 'suse'
           'apache2'
         when 'arch'
@@ -336,41 +332,37 @@ def default_session_cache
       end
 
       def config_file?(mod_name)
-        if %w(ldap
-              actions
-              alias
-              auth_cas
-              autoindex
-              cache_disk
-              cgid
-              dav_fs
-              deflate
-              dir
-              fastcgi
-              fcgid
-              include
-              info
-              ldap
-              mime_magic
-              mime
-              negotiation
-              pagespeed
-              proxy_balancer
-              proxy_ftp
-              proxy
-              reqtimeout
-              setenvif
-              ssl
-              status
-              userdir
-              mpm_event
-              mpm_prefork
-              mpm_worker
+        %w(ldap
+           actions
+           alias
+           auth_cas
+           autoindex
+           cache_disk
+           cgid
+           dav_fs
+           deflate
+           dir
+           fastcgi
+           fcgid
+           include
+           info
+           ldap
+           mime_magic
+           mime
+           negotiation
+           pagespeed
+           proxy_balancer
+           proxy_ftp
+           proxy
+           reqtimeout
+           setenvif
+           ssl
+           status
+           userdir
+           mpm_event
+           mpm_prefork
+           mpm_worker
         ).include?(mod_name)
-          true
-        else
-          false
-        end
       end
 
       def pagespeed_url
@@ -419,8 +411,7 @@ def apache_mod_php_modulename
         when 'amazon'
           'php8_module'
         when 'rhel'
-          # TODO: Remove when we no longer support RHEL 7
-          node['platform_version'].to_i >= 8 ? 'php7_module' : 'php5_module'
+          'php7_module'
         when 'debian'
           if platform?('debian') && node['platform_version'].to_i >= 12
             'php_module'
@@ -437,28 +428,21 @@ def apache_mod_php_modulename
       def apache_mod_php_filename
         case node['platform_family']
         when 'debian'
-          if platform?('debian') && node['platform_version'].to_i == 10
-            'libphp7.3.so'
-          elsif platform?('debian') && node['platform_version'].to_i == 11
+          if platform?('debian') && node['platform_version'].to_i == 11
             'libphp7.4.so'
           elsif platform?('debian') && node['platform_version'].to_i == 12
             'libphp8.2.so'
           elsif platform?('debian') && node['platform_version'].to_i >= 13
             'libphp8.4.so'
-          elsif platform?('ubuntu') && node['platform_version'].to_f == 18.04
-            'libphp7.2.so'
-          elsif platform?('ubuntu') && node['platform_version'].to_f == 20.04
-            'libphp7.4.so'
-          elsif platform?('ubuntu') && node['platform_version'].to_f >= 22.04 && node['platform_version'].to_f < 24.04
-            'libphp8.1.so'
           elsif platform?('ubuntu') && node['platform_version'].to_f >= 24.04
             'libphp8.3.so'
+          elsif platform?('ubuntu') && node['platform_version'].to_f >= 22.04
+            'libphp8.1.so'
           else
             'libphp7.0.so'
           end
         when 'rhel'
-          # TODO: Remove when we no longer support RHEL 7
-          node['platform_version'].to_i >= 8 ? 'libphp7.so' : 'libphp5.so'
+          'libphp7.so'
         when 'suse'
           if platform?('opensuse') && node['platform_version'].to_f >= 15.5
             'mod_php8.so'
@@ -474,24 +458,22 @@ def apache_mod_wsgi_package
         when 'debian'
           'libapache2-mod-wsgi-py3'
         when 'rhel', 'fedora', 'amazon'
-          # TODO: Remove when we no longer support RHEL 7
-          node['platform_version'].to_i >= 8 ? 'python3-mod_wsgi' : 'mod_wsgi'
+          'python3-mod_wsgi'
         when 'suse'
           'apache2-mod_wsgi-python3'
         end
       end
 
       def apache_mod_wsgi_filename
-        if platform_family?('rhel', 'fedora', 'amazon') && node['platform_version'].to_i >= 8
+        if platform_family?('rhel', 'fedora', 'amazon')
           'mod_wsgi_python3.so'
         else
           'mod_wsgi.so'
         end
       end
 
       def apache_mod_auth_cas_install_method
-        # TODO: Simplify when we no longer support RHEL 7
-        if (platform_family?('rhel') && node['platform_version'].to_i >= 8) || platform_family?('suse', 'fedora', 'amazon')
+        if platform_family?('rhel', 'suse', 'fedora', 'amazon')
           'source'
         else
           'package'

spec/libraries/mod_auth_cas_spec.rb

@@ -26,12 +26,6 @@ class DummyClass < Chef::Node
       it { expect(subject.apache_mod_auth_cas_install_method).to eq 'source' }
     end
 
-    context 'redhat 7' do
-      let(:platform_family) { 'rhel' }
-      let(:platform_version) { '7' }
-      it { expect(subject.apache_mod_auth_cas_install_method).to eq 'package' }
-    end
-
     context 'debian' do
       let(:platform_family) { 'debian' }
       let(:platform_version) { '11' }

spec/libraries/mod_wsgi_spec.rb

@@ -20,12 +20,6 @@ class DummyClass < Chef::Node
       it { expect(subject.apache_mod_wsgi_package).to eq 'python3-mod_wsgi' }
     end
 
-    context 'redhat 7' do
-      let(:platform_family) { 'rhel' }
-      let(:platform_version) { '7' }
-      it { expect(subject.apache_mod_wsgi_package).to eq 'mod_wsgi' }
-    end
-
     context 'debian' do
       let(:platform_family) { 'debian' }
       let(:platform_version) { '11' }
@@ -64,21 +58,15 @@ class DummyClass < Chef::Node
       it { expect(subject.apache_mod_wsgi_filename).to eq 'mod_wsgi_python3.so' }
     end
 
-    context 'redhat 7' do
-      let(:platform_family) { 'rhel' }
-      let(:platform_version) { '7.7.1908' }
-      it { expect(subject.apache_mod_wsgi_filename).to eq 'mod_wsgi.so' }
-    end
-
     context 'debian' do
       let(:platform_family) { 'debian' }
-      let(:platform_version) { '10' }
+      let(:platform_version) { '12' }
       it { expect(subject.apache_mod_wsgi_filename).to eq 'mod_wsgi.so' }
     end
 
     context 'ubuntu' do
       let(:platform_family) { 'debian' }
-      let(:platform_version) { '20.04' }
+      let(:platform_version) { '24.04' }
       it { expect(subject.apache_mod_wsgi_filename).to eq 'mod_wsgi.so' }
     end
 

spec/resources/mod_ssl_spec.rb

@@ -1,29 +1,20 @@
 # frozen_string_literal: true
 
-# TODO: Fix
-# resource apt_package[mod_ssl] is configured to notify resource execute[generate-module-list] with action run
-# Commenting out due to some notification bug.
-
 require 'spec_helper'
 
-# describe 'apache2_mod_ssl' do
-#   step_into :apache2_install, :apache2_mod_ssl
-#   platform 'ubuntu'
-
-#   context 'mod_ssl' do
-#     recipe do
-#       apache2_install 'package'
-#       apache2_mod_ssl 'default'
-#     end
+describe 'apache2_mod_ssl' do
+  step_into :apache2_mod_ssl
+  platform 'ubuntu'
 
-#     it 'outputs template correctly' do
-#       stub_command('/usr/sbin/apache2ctl -t').and_return('OK')
+  context 'mod_ssl default' do
+    recipe do
+      apache2_mod_ssl 'default'
+    end
 
-#       is_expected.not_to render_file('/etc/apache2/mods-available/ssl.conf')
-#         .with_content(/SSLStrictSNIVHostCheck Off/)
+    before do
+      stub_command('/usr/sbin/apache2ctl -t').and_return('OK')
+    end
 
-#       is_expected.to render_file('/etc/apache2/mods-available/ssl.conf')
-#         .with_content(/SSLProtocol TLSv1.2/)
-#     end
-#   end
-# end
+    it { is_expected.to create_template('/etc/apache2/mods-available/ssl.conf') }
+  end
+end