From c12d8800bb05dd1e7d074c13c38fa6dba6d3480d Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Tue, 27 Feb 2024 20:18:24 +0100 Subject: [PATCH 1/2] allow to omit command if `ensure` is `absent` in case ensure is absent, there is no need to define the `command` parameter. This restores backward compatibility with the 1.x version of the module. in case `ensure` is `present`, the a failure will be raised --- manifests/init.pp | 10 +++++----- spec/defines/init_spec.rb | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a69d2ec..c72c137 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -128,11 +128,11 @@ unit_entry => delete_undef_values({ 'Description' => $service_description , }) + $service_unit_overrides, - service_entry => { - 'ExecStart' => $command, - 'User' => $user, - 'Type' => $type, - } + $_service_overrides, + service_entry => delete_undef_values({ + 'ExecStart' => $command, # if ensure present command is defined is checked above + 'User' => $user, # defaults apply + 'Type' => $type, # defaults apply + }) + $_service_overrides, } systemd::manage_unit { "${unit_name}_cron.timer": ensure => $file_ensure, diff --git a/spec/defines/init_spec.rb b/spec/defines/init_spec.rb index b06d20e..e83a9c0 100644 --- a/spec/defines/init_spec.rb +++ b/spec/defines/init_spec.rb @@ -106,7 +106,6 @@ let :params do { ensure: 'absent', - command: '/bin/true' } end @@ -213,7 +212,6 @@ let :params do { on_boot_sec: 100, - on_unitactive_sec: 100, service_description: 'Print date', timer_description: 'Run date.service 100 seconds after boot', } From d9a6c4aed5bc0b997b9e6098ebcbe9fb91ee0c9d Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Tue, 27 Feb 2024 20:22:46 +0100 Subject: [PATCH 2/2] re-enable puppet 8 tests --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index ede1b47..a2f421e 100644 --- a/metadata.json +++ b/metadata.json @@ -14,7 +14,7 @@ }, { "name": "puppet-systemd", - "version_requirement": ">= 4.0.0 < 7.0.0" + "version_requirement": ">= 6.4.0 < 7.0.0" } ], "operatingsystem_support": [ @@ -30,7 +30,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.1.0 < 8.0.0" + "version_requirement": ">= 6.1.0 < 9.0.0" } ], "pdk-version": "3.0.1",