Merge pull request #595 from traylenator/multiexec

Let timer_wrapper support a list of commands

Author: traylenator

REFERENCE.md

@@ -2493,23 +2493,23 @@ whether the timer and service should be present or absent
 
 ##### <a name="-systemd--timer_wrapper--pre_command"></a>`pre_command`
 
-Data type: `Optional[Systemd::Unit::Service::Exec]`
+Data type: `Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]]`
 
 the ExecStartPre for the systemd service to execute
 
 Default value: `undef`
 
 ##### <a name="-systemd--timer_wrapper--command"></a>`command`
 
-Data type: `Optional[Systemd::Unit::Service::Exec]`
+Data type: `Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]]`
 
 the command for the systemd service to execute
 
 Default value: `undef`
 
 ##### <a name="-systemd--timer_wrapper--post_command"></a>`post_command`
 
-Data type: `Optional[Systemd::Unit::Service::Exec]`
+Data type: `Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]]`
 
 the ExecStartPost for the systemd service to execute
 

manifests/timer_wrapper.pp

@@ -38,21 +38,21 @@
 #     timer_unit_overrides   => { 'Description' => 'Very special timer' },
 #   }
 define systemd::timer_wrapper (
-  Enum['present', 'absent']              $ensure,
-  Optional[Systemd::Unit::Service::Exec] $pre_command = undef,
-  Optional[Systemd::Unit::Service::Exec] $command = undef,
-  Optional[Systemd::Unit::Service::Exec] $post_command = undef,
-  Optional[String[1]]                    $user = undef,
-  Optional[Systemd::Unit::Timespan]      $on_active_sec = undef,
-  Optional[Systemd::Unit::Timespan]      $on_boot_sec = undef,
-  Optional[Systemd::Unit::Timespan]      $on_start_up_sec = undef,
-  Optional[Systemd::Unit::Timespan]      $on_unit_active_sec = undef,
-  Optional[Systemd::Unit::Timespan]      $on_unit_inactive_sec = undef,
-  Optional[Systemd::Unit::Timespan]      $on_calendar = undef,
-  Systemd::Unit::Service                 $service_overrides         = {},
-  Systemd::Unit::Timer                   $timer_overrides           = {},
-  Systemd::Unit::Unit                    $timer_unit_overrides      = {},
-  Systemd::Unit::Unit                    $service_unit_overrides    = {},
+  Enum['present', 'absent'] $ensure,
+  Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]] $pre_command = undef,
+  Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]] $command = undef,
+  Optional[Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]]] $post_command = undef,
+  Optional[String[1]] $user = undef,
+  Optional[Systemd::Unit::Timespan] $on_active_sec = undef,
+  Optional[Systemd::Unit::Timespan] $on_boot_sec = undef,
+  Optional[Systemd::Unit::Timespan] $on_start_up_sec = undef,
+  Optional[Systemd::Unit::Timespan] $on_unit_active_sec = undef,
+  Optional[Systemd::Unit::Timespan] $on_unit_inactive_sec = undef,
+  Optional[Systemd::Unit::Timespan] $on_calendar = undef,
+  Systemd::Unit::Service $service_overrides = {},
+  Systemd::Unit::Timer $timer_overrides = {},
+  Systemd::Unit::Unit $timer_unit_overrides = {},
+  Systemd::Unit::Unit $service_unit_overrides = {},
 ) {
   $_timer_spec = {
     'OnActiveSec'       => $on_active_sec,

spec/defines/timer_wrapper_spec.rb

@@ -43,6 +43,18 @@
             is_expected.to contain_Systemd__Manage_unit("#{title}.timer")
             is_expected.to contain_Systemd__Unit_file("#{title}.timer")
           end
+
+          context 'with two commands' do
+            let :params do
+              super().merge({ command: ['/usr/bin/echo run this', '/usr/bin/echo and this'] })
+            end
+
+            it do
+              is_expected.to contain_file("/etc/systemd/system/#{title}.service").
+                with_content(%r{ExecStart=/usr/bin/echo run this}).
+                with_content(%r{ExecStart=/usr/bin/echo and this})
+            end
+          end
         end
 
         context 'failue when not passing calendar spec' do