fix: fix problems with deprecated modules and add additional test for multiple values

Author: ThomasMinor

manifests/mod/disk_cache.pp

@@ -28,15 +28,10 @@
 ) {
   deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
-  $_cache_ignore_headers = $cache_ignore_headers ? {
-    undef   => [],
-    default => $cache_ignore_headers.split(' ')
-  }
-
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
     cache_enable            => ['/'],
-    cache_ignore_headers    => $_cache_ignore_headers,
+    cache_ignore_headers    => $cache_ignore_headers,
     cache_dir_length        => 1,
     cache_dir_levels        => 2,
     configuration_file_name => 'cache_disk.conf'

spec/classes/mod/cache_spec.rb

@@ -18,7 +18,7 @@
     describe 'with cache_ignore_headers' do
       let(:params) do
         {
-          cache_ignore_headers: 'Set-Cookie',
+          cache_ignore_headers: ['Set-Cookie'],
         }
       end
 
@@ -28,6 +28,19 @@
       }
     end
 
+    describe 'with cache_ignore_headers' do
+      let(:params) do
+        {
+          cache_ignore_headers: %w[Set-Cookie X-Forwarded-For Cross-Origin-Embedder-Policy Expires Access-Control-Allow-Headers],
+        }
+      end
+
+      it {
+        expect(subject).to contain_file('cache.conf')
+          .with(content: %r{CacheIgnoreHeaders Access-Control-Allow-Headers Cross-Origin-Embedder-Policy Expires Set-Cookie X-Forwarded-For})
+      }
+    end
+
     describe 'with cache_default_expire' do
       let(:params) do
         {

spec/classes/mod/disk_cache_spec.rb

@@ -14,7 +14,7 @@
 
     let :pre_condition do
       'class{ "apache":
-        default_mods   => ["cache"],
+        default_mods   => ["cache", "disk_cache"],
         mod_dir        => "/tmp/junk",
        }'
     end

templates/mod/cache.conf.epp

@@ -25,6 +25,6 @@ CacheLock <%= $cache_lock %>
 <%- if $cache_ignore_cache_control { -%>
 CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
-<%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers.join(' ') %>
+<%- if ! empty($cache_ignore_headers) { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers.sort.join(' ') %>
 <%- } -%>

templates/mod/cache_disk.conf.epp

@@ -1,9 +1,10 @@
 <% |
-  Optional[String] $cache_root          = undef,
-  Array[String] $cache_enable           = [],
-  Optional[Integer] $cache_dir_length   = undef,
-  Optional[Integer] $cache_dir_levels   = undef,
-  Optional[Integer] $cache_max_filesize = undef,
+  Optional[String] $cache_root            = undef,
+  Array[String] $cache_enable             = [],
+  Optional[Integer] $cache_dir_length     = undef,
+  Optional[Integer] $cache_dir_levels     = undef,
+  Optional[Integer] $cache_max_filesize   = undef,
+  Optional[String] $cache_ignore_headers  = undef,
 | -%>
 <%- if $cache_enable { -%>
   <%- $cache_enable.each |$enable| { -%>
@@ -20,3 +21,6 @@ CacheDirLength <%= $cache_dir_length %>
 <%- if $cache_max_filesize { -%>
 CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
+<%- if $cache_ignore_headers { -%>
+CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+<%- } -%>