From c005a4884b3210a4314b9ccea13ea63b1da84dc2 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 20 Sep 2018 10:16:49 +0200 Subject: [PATCH 1/2] move to data type based validations --- manifests/init.pp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3974f05..9c64b6f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -71,26 +71,12 @@ # * Ian Bissett # class conntrackd ( - $ensure = $conntrackd::params::ensure, - $autoupgrade = $conntrackd::params::autoupgrade, - $status = $conntrackd::params::status, + Enum['present','absent'] $ensure = $conntrackd::params::ensure, + Boolean $autoupgrade = $conntrackd::params::autoupgrade, + Enum['enabled', 'disabled', + 'running', 'unmanaged'] $status = $conntrackd::params::status, ) inherits conntrackd::params { - #### Validate parameters - - # ensure - if ! ($ensure in [ 'present', 'absent' ]) { - fail("\"${ensure}\" is not a valid ensure parameter value") - } - - # autoupgrade - validate_bool($autoupgrade) - - # service status - if ! ($status in [ 'enabled', 'disabled', 'running', 'unmanaged' ]) { - fail("\"${status}\" is not a valid status parameter value") - } - #### Manage actions # package From b5b7fd8bbe32cc727941ecaae7eba01fd0fe14db Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 20 Sep 2018 10:17:47 +0200 Subject: [PATCH 2/2] linting --- manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9c64b6f..77e93d4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -75,15 +75,15 @@ Boolean $autoupgrade = $conntrackd::params::autoupgrade, Enum['enabled', 'disabled', 'running', 'unmanaged'] $status = $conntrackd::params::status, - ) inherits conntrackd::params { +) inherits conntrackd::params { #### Manage actions # package - class { 'conntrackd::package': } + include ::conntrackd::package # service - class { 'conntrackd::service': } + include ::conntrackd::service #### Manage relationships