CIDM-1566 - Add via-header and repose-version to container config

Author: scarlettmoonbell

manifests/filter/container.pp

@@ -189,8 +189,20 @@
 #
 # [*via*]
 # String. String used in the Via header.
+# Depreciated, to be removed in Repose 9.0.0.0
 # Defaults to <tt>undef</tt>
 #
+# [*via_header*]
+# String. String used in the Via header.
+# Requires Repose version 8.4.1.0 or higher
+# Defaults to <tt>undef</tt>
+#
+# [*repose_version*]
+# String. string (true or false) to define if the version is displayed in
+# the Via header defaults to true to maintain default behavior if undefined.
+# Requires Repose version 8.4.1.0 or higher
+# Defaults to <tt>true</tt>
+#
 # [*log_herp_flume*]
 # Enable herp filter publishing to flume.
 # Defaults to <tt>false</tt>
@@ -311,6 +323,7 @@
   $syslog_port                          = $repose::params::syslog_port,
   $syslog_protocol                      = $repose::params::syslog_protocol,
   $via                                  = undef,
+  $via_header                           = undef,
   $flume_host                           = $repose::params::flume_host,
   $flume_port                           = $repose::params::flume_port,
   # BELOW ARE DEPRECATED
@@ -320,6 +333,7 @@
   $connection_timeout                   = undef,
   $read_timeout                         = undef,
   $proxy_thread_pool                    = undef,
+  $repose_version                       = 'true',
 ) inherits repose::params {
 
 ### Validate parameters

puppet-module-repose.spec

@@ -2,7 +2,7 @@
 %define base_name repose
 
 Name:      puppet-module-%{user}-%{base_name}
-Version:   2.8.0
+Version:   2.9.0
 Release:   1
 BuildArch: noarch
 Summary:   Puppet module to configure %{base_name}
@@ -30,6 +30,8 @@ cp -pr * %{buildroot}%{module_dir}/
 %{module_dir}
 
 %changelog
+* Mon Dec 17 2018 Josh Bell <josh.bell@rackspace.com> - 2.9.0-1
+- Add via_header and repose_version options to container filter
 * Mon May 12 2018  Josh Bell <josh.bell@rackspace.com> - 2.8.0-1
 - Add ssl protocol and tls renegotiation options to container filter
 * Mon Apr 02 2018 Dimitry Ushakov <dimitry.ushakov@rackspace.com> - 2.7.0-1

spec/classes/filter/container_spec.rb

@@ -68,6 +68,7 @@
       let(:params) { {
         :app_name                          => 'app',
         :via                               => 'my app',
+        :repose_version                    => 'true',
         :deployment_directory              => '/deployment_dir',
         :deployment_directory_auto_clean   => 'false',
         :artifact_directory                => '/artifact_dir',
@@ -97,6 +98,7 @@
           with_content(/http-port="10000"/).
           with_content(/https-port="10001"/).
           with_content(/via="my app"/).
+          with_content(/repose-version="true"/).
           with_content(/content-body-read-limit="10240000"/).
           with_content(/connection-timeout="40000"/).
           with_content(/read-timeout="1000"/).
@@ -397,6 +399,28 @@
       }
     end
 
+    context 'define via_header option' do
+      let(:params) { {
+        :app_name => 'app',
+        :via_header => 'Potato'
+      } }
+      it {
+        should contain_file('/etc/repose/container.cfg.xml').
+          with_content(/via-header="Potato"/)
+      }
+    end
+
+    context 'define repose_version as false' do
+      let(:params) { {
+        :app_name => 'app',
+        :repose_version => 'false'
+      } }
+      it {
+        should contain_file('/etc/repose/container.cfg.xml').
+          with_content(/repose-version="false"/)
+      }
+    end
+
     context 'with defaults with old namespace' do
       let :pre_condition do
         "class { 'repose': cfg_new_namespace => false }"

templates/container.cfg.xml.erb

@@ -12,6 +12,9 @@
 <%- if @via -%>
         via="<%= @via %>"
 <%- end -%>
+<%- if @via_header -%>
+        via-header="<%= @via_header %>"
+<%- end -%>
 <%- if @content_body_read_limit -%>
         content-body-read-limit="<%= @content_body_read_limit %>"
 <%- end -%>
@@ -30,6 +33,7 @@
 <%- if @jmx_reset_time -%>
         jmx-reset-time="<%= @jmx_reset_time -%>"
 <%- end -%>
+        repose-version="<%= @repose_version %>"
         >
 
         <deployment-directory auto-clean="<%= @deployment_directory_auto_clean %>"><%= @deployment_directory %></deployment-directory>