From 0cad88cdad05e767d9992fdce76ebab388602e1f Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Wed, 7 Aug 2024 22:25:26 +1000
Subject: [PATCH] chore: prevent empty lines

- prevent empty lines when user features are not enabled
- change epp to erb template for user objects
---
 modules/glauth/manifests/obj/user.pp  | 15 +--------------
 modules/glauth/templates/obj/user.epp | 14 --------------
 modules/glauth/templates/obj/user.erb | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 28 deletions(-)
 delete mode 100644 modules/glauth/templates/obj/user.epp
 create mode 100644 modules/glauth/templates/obj/user.erb

diff --git a/modules/glauth/manifests/obj/user.pp b/modules/glauth/manifests/obj/user.pp
index dd48131..1b687a4 100644
--- a/modules/glauth/manifests/obj/user.pp
+++ b/modules/glauth/manifests/obj/user.pp
@@ -20,20 +20,7 @@ define glauth::obj::user (
   }
   concat::fragment { "glauth_user_${user_name}":
     target  => $config_path,
-    content => epp('glauth/obj/user.epp', {
-      'name'          => $user_name,
-      'givenname'     => $givenname,
-      'sn'            => $sn,
-      'mail'          => $mail,
-      'uidnumber'     => $uidnumber,
-      'primarygroup'  => $primarygroup,
-      'loginshell'    => $loginshell,
-      'homedir'       => $homedir,
-      'passsha256'    => $passsha256,
-      'sshkeys'       => $sshkeys,
-      'passappsha256' => $passappsha256,
-      'othergroups'   => $formatted_othergroups,
-    }),
+    content => template('glauth/obj/user.erb'),
     order   => '70',
   }
 }
diff --git a/modules/glauth/templates/obj/user.epp b/modules/glauth/templates/obj/user.epp
deleted file mode 100644
index 4f62916..0000000
--- a/modules/glauth/templates/obj/user.epp
+++ /dev/null
@@ -1,14 +0,0 @@
-[[users]]
-  name = "<%= $name %>"
-  <% if $givenname != '' { %>givenname = "<%= $givenname %>"<% } %>
-  <% if $sn != '' { %>sn = "<%= $sn %>"<% } %>
-  mail = "<%= $mail %>"
-  uidnumber = <%= $uidnumber %>
-  primarygroup = <%= $primarygroup %>
-  <% if $loginshell != '' { %>loginShell = "<%= $loginshell %>"<% } %>
-  <% if $homedir != '' { %>homeDir = "<%= $homedir %>"<% } %>
-  passsha256 = "<%= $passsha256 %>"
-  <% if $sshkeys.length > 0 { %>sshkeys = [<% $sshkeys.each |String $key| { %>"<%= $key %>", <% } %>]<% } %>
-  <% if $passappsha256.length > 0 { %>passappsha256 = [<% $passappsha256.each |String $pass| { %>"<%= $pass %>", <% } %>]<% } %>
-  othergroups = <%= $othergroups %>
-
diff --git a/modules/glauth/templates/obj/user.erb b/modules/glauth/templates/obj/user.erb
new file mode 100644
index 0000000..6280e00
--- /dev/null
+++ b/modules/glauth/templates/obj/user.erb
@@ -0,0 +1,26 @@
+[[users]]
+  name = "<%= @user_name %>"
+<% if @givenname != '' -%>
+  givenname = "<%= @givenname %>"
+<% end -%>
+<% if @sn != '' -%>
+  sn = "<%= @sn %>"
+<% end -%>
+  mail = "<%= @mail %>"
+  uidnumber = <%= @uidnumber %>
+  primarygroup = <%= @primarygroup %>
+<% if @loginshell != '' -%>
+  loginShell = "<%= @loginshell %>"
+<% end -%>
+<% if @homedir != '' -%>
+  homeDir = "<%= @homedir %>"
+<% end -%>
+  passsha256 = "<%= @passsha256 %>"
+<% if @sshkeys.length > 0 -%>
+  sshkeys = [<%= @sshkeys.map { |key| "\"#{key}\"" }.join(', ') %>]
+<% end -%>
+<% if @passappsha256.length > 0 -%>
+  passappsha256 = [<%= @passappsha256.map { |pass| "\"#{pass}\"" }.join(', ') %>]
+<% end -%>
+  othergroups = <%= @formatted_othergroups %>
+