From 052d95b41430968b00e8146e0a2d3aa442af3ffc Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Tue, 14 Feb 2023 16:53:04 +0000 Subject: [PATCH] parameter datatypes --- .puppet-lint.rc | 1 - .sync.yml | 3 --- Rakefile | 1 - manifests/init.pp | 14 +++++++------- manifests/linux.pp | 16 ++++++++-------- manifests/linux/archlinux.pp | 10 +++++----- manifests/linux/debian.pp | 10 +++++----- manifests/linux/gentoo.pp | 10 +++++----- manifests/linux/redhat.pp | 20 ++++++++++---------- 9 files changed, 40 insertions(+), 45 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 5421683..cc96ece 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,2 +1 @@ --relative ---no-parameter_types-check diff --git a/.sync.yml b/.sync.yml index 88cce1e..93ccd8b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -32,6 +32,3 @@ spec/spec_helper.rb: .travis.yml: delete: true changelog_since_tag: 'v3.0.0' -Rakefile: - extra_disabled_lint_checks: - - parameter_types diff --git a/Rakefile b/Rakefile index bc50d6f..1a8c463 100644 --- a/Rakefile +++ b/Rakefile @@ -42,7 +42,6 @@ def changelog_future_release end PuppetLint.configuration.send('disable_relative') -PuppetLint.configuration.send('disable_parameter_types') if Bundler.rubygems.find_name('github_changelog_generator').any? diff --git a/manifests/init.pp b/manifests/init.pp index b933d78..d848010 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,13 +31,13 @@ # Controls whether puppet manages the ebtables package or not. If managed, the package will use the value of pkg_ensure. # class firewall ( - $ensure = running, - $ensure_v6 = undef, - $pkg_ensure = present, - $service_name = $firewall::params::service_name, - $service_name_v6 = $firewall::params::service_name_v6, - $package_name = $firewall::params::package_name, - $ebtables_manage = false, + Enum[running, stopped, 'running', 'stopped'] $ensure = running, + Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef, + Enum[present, latest, 'present', 'latest'] $pkg_ensure = present, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Boolean $ebtables_manage = false, ) inherits firewall::params { $_ensure_v6 = pick($ensure_v6, $ensure) diff --git a/manifests/linux.pp b/manifests/linux.pp index f800847..5c15c8e 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -24,14 +24,14 @@ # @api private # class firewall::linux ( - $ensure = running, - $ensure_v6 = undef, - $pkg_ensure = installed, - $service_name = $firewall::params::service_name, - $service_name_v6 = $firewall::params::service_name_v6, - $package_name = $firewall::params::package_name, - $ebtables_manage = false, - $iptables_name = $firewall::params::iptables_name, + Enum[running, stopped, 'running', 'stopped'] $ensure = running, + Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef, + Enum[installed, latest, 'installed', 'latest'] $pkg_ensure = installed, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Boolean $ebtables_manage = false, + String[1] $iptables_name = $firewall::params::iptables_name, ) inherits firewall::params { $enable = $ensure ? { 'running' => true, diff --git a/manifests/linux/archlinux.pp b/manifests/linux/archlinux.pp index d04fe1f..da82363 100644 --- a/manifests/linux/archlinux.pp +++ b/manifests/linux/archlinux.pp @@ -19,11 +19,11 @@ # @api private # class firewall::linux::archlinux ( - $ensure = 'running', - $enable = true, - $service_name = $firewall::params::service_name, - $package_name = $firewall::params::package_name, - $package_ensure = $firewall::params::package_ensure, + Enum[running, stopped, 'running', 'stopped'] $ensure = 'running', + Boolean $enable = true, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure, ) inherits firewall::params { if $package_name { package { $package_name: diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp index 4498241..47ab859 100644 --- a/manifests/linux/debian.pp +++ b/manifests/linux/debian.pp @@ -19,11 +19,11 @@ # @api private # class firewall::linux::debian ( - $ensure = running, - $enable = true, - $service_name = $firewall::params::service_name, - $package_name = $firewall::params::package_name, - $package_ensure = $firewall::params::package_ensure, + Enum[running, stopped, 'running', 'stopped'] $ensure = running, + Boolean $enable = true, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure, ) inherits firewall::params { if $package_name { ensure_packages([$package_name], { diff --git a/manifests/linux/gentoo.pp b/manifests/linux/gentoo.pp index 22a439e..0f84578 100644 --- a/manifests/linux/gentoo.pp +++ b/manifests/linux/gentoo.pp @@ -19,11 +19,11 @@ # @api private # class firewall::linux::gentoo ( - $ensure = 'running', - $enable = true, - $service_name = $firewall::params::service_name, - $package_name = $firewall::params::package_name, - $package_ensure = $firewall::params::package_ensure, + Enum[running, stopped, 'running', 'stopped'] $ensure = running, + Boolean $enable = true, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure, ) inherits firewall::params { if $package_name { package { $package_name: diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp index 4fccd57..9965043 100644 --- a/manifests/linux/redhat.pp +++ b/manifests/linux/redhat.pp @@ -32,16 +32,16 @@ # @api private # class firewall::linux::redhat ( - $ensure = running, - $ensure_v6 = undef, - $enable = true, - $enable_v6 = undef, - $service_name = $firewall::params::service_name, - $service_name_v6 = $firewall::params::service_name_v6, - $package_name = $firewall::params::package_name, - $package_ensure = $firewall::params::package_ensure, - $sysconfig_manage = $firewall::params::sysconfig_manage, - $firewalld_manage = $firewall::params::firewalld_manage, + Enum[running, stopped, 'running', 'stopped'] $ensure = running, + Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef, + Boolean $enable = true, + Optional[Boolean] $enable_v6 = undef, + Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name, + Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6, + Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name, + Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure, + Boolean $sysconfig_manage = $firewall::params::sysconfig_manage, + Boolean $firewalld_manage = $firewall::params::firewalld_manage, ) inherits firewall::params { $_ensure_v6 = pick($ensure_v6, $ensure) $_enable_v6 = pick($enable_v6, $enable) -- 2.45.2