From 401dcf68dc98f629bae2ddf2a98ecdf18dbf6e0d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 6 Mar 2019 19:34:07 +0100 Subject: enhance type validation; require stdlib 4.25.0 This isn't a breaking change. Now puppet just stops accepting values that the underlying software (ferm) doesn't accept. --- manifests/rule.pp | 8 ++++---- metadata.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/rule.pp b/manifests/rule.pp index 6f448f9..c87ef7f 100644 --- a/manifests/rule.pp +++ b/manifests/rule.pp @@ -14,10 +14,10 @@ define ferm::rule ( Ferm::Policies $policy, Ferm::Protocols $proto, String $comment = $name, - Optional[Variant[Integer,String]] $dport = undef, - Optional[Variant[Integer,String]] $sport = undef, - Optional[String] $saddr = undef, - Optional[String] $daddr = undef, + Optional[Variant[Stdlib::Port,String[1]]] $dport = undef, + Optional[Variant[Stdlib::Port,String[1]]] $sport = undef, + Optional[String[1]] $saddr = undef, + Optional[String[1]] $daddr = undef, Optional[String[1]] $proto_options = undef, Enum['absent','present'] $ensure = 'present', ){ diff --git a/metadata.json b/metadata.json index 78436f1..563cc8a 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 6.0.0" + "version_requirement": ">= 4.25.0 < 6.0.0" }, { "name": "puppetlabs/concat", -- cgit v1.2.3 From b5944f63cff01edcece5c0af00acfef8a5fc10dc Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 6 Mar 2019 19:38:12 +0100 Subject: regenerate REFERENCE.md --- REFERENCE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index e9736fb..983ee46 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -212,7 +212,7 @@ Default value: $name ##### `dport` -Data type: `Optional[Variant[Integer,String]]` +Data type: `Optional[Variant[Stdlib::Port,String[1]]]` The destination port, can be a range as string or a single port number as integer @@ -220,7 +220,7 @@ Default value: `undef` ##### `sport` -Data type: `Optional[Variant[Integer,String]]` +Data type: `Optional[Variant[Stdlib::Port,String[1]]]` The source port, can be a range as string or a single port number as integer @@ -228,7 +228,7 @@ Default value: `undef` ##### `saddr` -Data type: `Optional[String]` +Data type: `Optional[String[1]]` The source address we want to match @@ -236,7 +236,7 @@ Default value: `undef` ##### `daddr` -Data type: `Optional[String]` +Data type: `Optional[String[1]]` The destination address we want to match -- cgit v1.2.3