Refactor sssd.conf template

Author: silug

manifests/config.pp

@@ -68,31 +68,73 @@
     }
   }
 
+  # Build configuration lines in order (matching expected test output)
+  # Services configuration - sudo has to be started by the socket
+  $filtered_services = Array($_services) - ['sudo']
+  $services_line = $_services.empty ? {
+    true => [],
+    false => $filtered_services.empty ? { true => [], false => ["services = ${filtered_services.join(',')}"] }
+  }
+
+  # Basic configuration
+  $description_line = $_description ? { undef => [], default => ["description = ${_description}"] }
+
+  # Domains configuration
+  $domains_line = $_domains.empty ? { true => [], false => ["domains = ${Array($_domains).join(', ')}"] }
+
+  # Required configuration parameters
+  $config_file_version_line = ["config_file_version = ${_config_file_version}"]
+  $reconnection_retries_line = ["reconnection_retries = ${_reconnection_retries}"]
+
+  # Optional string parameters
+  $re_expression_line = $_re_expression ? { undef => [], default => ["re_expression = ${_re_expression}"] }
+  $full_name_format_line = $_full_name_format ? { undef => [], default => ["full_name_format = ${_full_name_format}"] }
+
+  # Optional boolean parameters (special undef checking)
+  $try_inotify_line = $_try_inotify ? { undef => [], default => ["try_inotify = ${_try_inotify}"] }
+  $enable_files_domain_line = $_enable_files_domain ? { undef => [], default => ["enable_files_domain = ${_enable_files_domain}"] }
+
+  # Optional directory and user parameters
+  $krb5_rcache_dir_line = $_krb5_rcache_dir ? { undef => [], default => ["krb5_rcache_dir = ${_krb5_rcache_dir}"] }
+  $user_line = $_user ? { undef => [], default => ["user = ${_user}"] }
+  $default_domain_suffix_line = $_default_domain_suffix ? { undef => [], default => ["default_domain_suffix = ${_default_domain_suffix}"] }
+  $override_space_line = $_override_space ? { undef => [], default => ["override_space = ${_override_space}"] }
+
+  # Debug configuration
+  $debug_level_line = $_debug_level ? { undef => [], default => ["debug_level = ${_debug_level}"] }
+  $debug_timestamps_line = ["debug_timestamps = ${_debug_timestamps}"]
+  $debug_microseconds_line = ["debug_microseconds = ${_debug_microseconds}"]
+
+  # Combine all lines in order
+  $config_lines = (
+    $services_line +
+    $description_line +
+    $domains_line +
+    $config_file_version_line +
+    $reconnection_retries_line +
+    $re_expression_line +
+    $full_name_format_line +
+    $try_inotify_line +
+    $krb5_rcache_dir_line +
+    $user_line +
+    $default_domain_suffix_line +
+    $override_space_line +
+    $enable_files_domain_line +
+    $debug_level_line +
+    $debug_timestamps_line +
+    $debug_microseconds_line
+  )
+
+  # Join all configuration lines
+  $content = $config_lines.join("\n")
+
   file { '/etc/sssd/sssd.conf':
     owner   => 'root',
     group   => 'root',
     mode    => '0600',
-    content => epp(
-      "${module_name}/sssd.conf.epp",
-      {
-        '_domains'               => $_domains,
-        '_debug_level'           => $_debug_level,
-        '_debug_timestamps'      => $_debug_timestamps,
-        '_debug_microseconds'    => $_debug_microseconds,
-        '_description'           => $_description,
-        '_enable_files_domain'   => $_enable_files_domain,
-        '_config_file_version'   => $_config_file_version,
-        '_services'              => $_services,
-        '_reconnection_retries'  => $_reconnection_retries,
-        '_re_expression'         => $_re_expression,
-        '_full_name_format'      => $_full_name_format,
-        '_try_inotify'           => $_try_inotify,
-        '_krb5_rcache_dir'       => $_krb5_rcache_dir,
-        '_user'                  => $_user,
-        '_default_domain_suffix' => $_default_domain_suffix,
-        '_override_space'        => $_override_space,
-      },
-    ),
+    content => epp("${module_name}/sssd.conf.epp", {
+        'content' => $content,
+    }),
     notify  => Class["${module_name}::service"],
   }
 }

templates/sssd.conf.epp

@@ -1,63 +1,6 @@
 <% |
-  Optional[String]            $_description,
-  Optional[Array[String]]     $_services,
-  Optional[Array[String]]     $_domains,
-  Integer[1]                  $_config_file_version,
-  Integer[0]                  $_reconnection_retries,
-  Optional[String]            $_re_expression,
-  Optional[String]            $_full_name_format,
-  Optional[Boolean]           $_try_inotify,
-  Optional[String]            $_krb5_rcache_dir,
-  Optional[String]            $_user,
-  Optional[String]            $_default_domain_suffix,
-  Optional[String]            $_override_space,
-  Optional[Boolean]           $_enable_files_domain,
-  Optional[Sssd::DebugLevel]  $_debug_level,
-  Boolean                     $_debug_timestamps,
-  Boolean                     $_debug_microseconds,
+  String[1] $content,
 | -%>
 # sssd::config
 [sssd]
-<%
-  # sudo has to be started by the socket
-  unless Array($_services).empty {
--%>
-services = <%= (Array($_services) - ['sudo']).join(',') %>
-<% } -%>
-<% if $_description { -%>
-description = <%= $_description %>
-<% } -%>
-<% unless $_domains.empty { -%>
-domains = <%= Array($_domains).join(', ') %>
-<% } -%>
-config_file_version = <%= $_config_file_version %>
-reconnection_retries = <%= $_reconnection_retries %>
-<% if $_re_expression { -%>
-re_expression = <%= $_re_expression %>
-<% } -%>
-<% if $_full_name_format { -%>
-full_name_format = <%= $_full_name_format %>
-<% } -%>
-<% unless $_try_inotify =~ Undef { -%>
-try_inotify = <%= $_try_inotify %>
-<% } -%>
-<% if $_krb5_rcache_dir { -%>
-krb5_rcache_dir = <%= $_krb5_rcache_dir %>
-<% } -%>
-<% if $_user { -%>
-user = <%= $_user %>
-<% } -%>
-<% if $_default_domain_suffix { -%>
-default_domain_suffix = <%= $_default_domain_suffix %>
-<% } -%>
-<% if $_override_space { -%>
-override_space = <%= $_override_space %>
-<% } -%>
-<% unless $_enable_files_domain =~ Undef { -%>
-enable_files_domain = <%=  $_enable_files_domain %>
-<% } -%>
-<% unless $_debug_level =~ Undef { -%>
-debug_level = <%= $_debug_level %>
-<% } -%>
-debug_timestamps = <%= $_debug_timestamps %>
-debug_microseconds = <%= $_debug_microseconds %>
+<%= $content %>