Merge pull request #564 from puppetlabs/CONT-1144-erb_to_epp_conversion_haproxy

(CONT-1144) - Conversion of ERB to EPP templates

Author: jordanbreen28

REFERENCE.md

@@ -1247,7 +1247,7 @@ Data type: `String`
 
 The template that will be used to create an unit file.
 
-Default value: `'haproxy/instance_service_unit.erb'`
+Default value: `'haproxy/instance_service_unit.epp'`
 
 ### <a name="haproxy--listen"></a>`haproxy::listen`
 

lib/puppet/functions/haproxy/generate_error_message.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Function created to generate error message. Any string as error message can be passed and the function can
+# be called in epp templates.
+
+Puppet::Functions.create_function(:'haproxy::generate_error_message') do
+  dispatch :generate_error_message do
+    param 'String', :error_message
+  end
+
+  def generate_error_message(error_message)
+    raise(error_message)
+  end
+end

lib/puppet/functions/haproxy/sort_bind.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Puppet::Functions.create_function(:'haproxy::sort_bind') do
+  dispatch :sort_bind do
+    param 'Hash', :bind
+    return_type 'Array'
+  end
+
+  def sort_bind(bind)
+    bind.sort_by do |address_port|
+      md = %r{^((\d+)\.(\d+)\.(\d+)\.(\d+))?(.*)}.match(address_port[0])
+      [(md[1] ? md[2..5].inject(0) { |addr, octet| (addr << 8) + octet.to_i } : -1), md[6]]
+    end
+  end
+end

lib/puppet/functions/haproxy/validate_ip_addr.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'ipaddr'
+
+Puppet::Functions.create_function(:'haproxy::validate_ip_addr') do
+  dispatch :validate_ip_addr do
+    param 'String', :virtual_ip
+    return_type 'Boolean'
+  end
+
+  def validate_ip_addr(virtual_ip)
+    IPAddr.new(virtual_ip)
+    true
+  rescue StandardError
+    false
+  end
+end

manifests/backend.pp

@@ -125,11 +125,19 @@
     $order = "25-${defaults}-${section_name}-01"
   }
 
+  $parameters = {
+    'section_name'             => $section_name,
+    'mode'                     => $mode,
+    'description'              => $description,
+    '_sort_options_alphabetic' => $_sort_options_alphabetic,
+    'options'                  => $options,
+  }
+
   # Template uses: $section_name, $ipaddress, $ports, $options
   concat::fragment { "${instance_name}-${section_name}_backend_block":
     order   => $order,
     target  => $_config_file,
-    content => template('haproxy/haproxy_backend_block.erb'),
+    content => epp('haproxy/haproxy_backend_block.epp', $parameters),
   }
 
   if $collect_exported {

manifests/balancermember.pp

@@ -167,10 +167,25 @@
   } else {
     $order = "25-${defaults}-${listening_service}-02-${name}"
   }
+
+  $parameters = {
+    'type'           => $type,
+    'ipaddresses'    => $ipaddresses,
+    'server_names'   => $server_names,
+    'ports'          => $ports,
+    'define_cookies' => $define_cookies,
+    'options'        => $options,
+    'verifyhost'     => $verifyhost,
+    'weight'         => $weight,
+    'prefix'         => $prefix,
+    'amount'         => $amount,
+    'fqdn'           => $fqdn,
+    'port'           => $port,
+  }
   # Template uses $ipaddresses, $server_name, $ports, $option
   concat::fragment { "${instance_name}-${listening_service}_balancermember_${name}":
     order   => $order,
     target  => $_config_file,
-    content => template('haproxy/haproxy_balancermember.erb'),
+    content => epp('haproxy/haproxy_balancermember.epp', $parameters),
   }
 }

manifests/config.pp

@@ -70,11 +70,17 @@
       content => "# This file is managed by Puppet\n",
     }
 
+    $parameters = {
+      '_global_options'   => $_global_options,
+      '_defaults_options' => $_defaults_options,
+      'custom_fragment'   => $custom_fragment,
+    }
+
     # Template uses $_global_options, $_defaults_options, $custom_fragment
     concat::fragment { "${instance_name}-haproxy-base":
       target  => $_config_file,
       order   => '10',
-      content => template("${module_name}/haproxy-base.cfg.erb"),
+      content => epp("${module_name}/haproxy-base.cfg.epp", $parameters),
     }
   }
 

manifests/defaults.pp

@@ -36,9 +36,15 @@
   include haproxy::globals
   $_sort_options_alphabetic = pick($sort_options_alphabetic, $haproxy::globals::sort_options_alphabetic)
 
+  $parameters = {
+    '_sort_options_alphabetic' => $_sort_options_alphabetic,
+    'options'                  => $options,
+    'name'                     => $name,
+  }
+
   concat::fragment { "${instance_name}-${name}_defaults_block":
     order   => "25-${name}",
     target  => $config_file,
-    content => template('haproxy/haproxy_defaults_block.erb'),
+    content => epp('haproxy/haproxy_defaults_block.epp', $parameters),
   }
 }

manifests/frontend.pp

@@ -143,10 +143,23 @@
       $order = "25-${defaults}-${section_name}-00"
     }
   }
+
+  $parameters = {
+    'section_name'             => $section_name,
+    'bind'                     => $bind,
+    'ipaddress'                => $ipaddress,
+    'ports'                    => $ports,
+    'bind_options'             => $bind_options,
+    'mode'                     => $mode,
+    'description'              => $description,
+    'options'                  => $options,
+    '_sort_options_alphabetic' => $_sort_options_alphabetic,
+  }
+
   # Template uses: $section_name, $ipaddress, $ports, $options
   concat::fragment { "${instance_name}-${section_name}_frontend_block":
     order   => $order,
     target  => $_config_file,
-    content => template('haproxy/haproxy_frontend_block.erb'),
+    content => epp('haproxy/haproxy_frontend_block.epp', $parameters),
   }
 }

manifests/instance_service.pp

@@ -42,7 +42,7 @@
 #
 define haproxy::instance_service (
   Optional[String]      $haproxy_init_source    = undef,
-  String                $haproxy_unit_template  = 'haproxy/instance_service_unit.erb',
+  String                $haproxy_unit_template  = 'haproxy/instance_service_unit.epp',
   String                $haproxy_package        = 'haproxy',
   Stdlib::Absolutepath  $bindir                 = '/opt/haproxy/bin',
 ) {
@@ -103,12 +103,16 @@
         $unitfile = "/lib/systemd/system/haproxy-${title}.service"
       }
 
+      $parameters = {
+        'title'   => $title,
+        'wrapper' => $wrapper,
+      }
       file { $unitfile:
         ensure  => file,
         mode    => '0644',
         owner   => 'root',
         group   => 'root',
-        content => template($haproxy_unit_template),
+        content => epp($haproxy_unit_template, $parameters),
         notify  => Exec['systemctl daemon-reload'],
       }
       if (!defined(Exec['systemctl daemon-reload'])) {