Do not allow empty strings to be passed

voxpupuli · Jul 11, 2018 · 49173a3 · 49173a3
1 parent e745233
commit 49173a3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/manifests/plugin/threshold.pp b/manifests/plugin/threshold.pp
@@ -2,9 +2,9 @@
 class collectd::plugin::threshold (
   $ensure   = 'present',
   $interval = undef,
-  Hash[String, Collectd::Threshold::Type]   $types   = {},
-  Hash[String, Collectd::Threshold::Plugin] $plugins = {},
-  Hash[String, Collectd::Threshold::Host]   $hosts   = {},
+  Hash[String[1], Collectd::Threshold::Type]   $types   = {},
+  Hash[String[1], Collectd::Threshold::Plugin] $plugins = {},
+  Hash[String[1], Collectd::Threshold::Host]   $hosts   = {},
 ) {
 
   include ::collectd

diff --git a/types/threshold/host.pp b/types/threshold/host.pp
@@ -1,4 +1,4 @@
 type Collectd::Threshold::Host = Struct[{
-  plugins => Hash[String, Collectd::Threshold::Plugin],
-  types   => Hash[String, Collectd::Threshold::Type],
+  plugins => Hash[String[1], Collectd::Threshold::Plugin],
+  types   => Hash[String[1], Collectd::Threshold::Type],
 }]
diff --git a/types/threshold/plugin.pp b/types/threshold/plugin.pp
@@ -1,4 +1,4 @@
 type Collectd::Threshold::Plugin = Struct[{
-  instance => Optional[String],
-  types    => Hash[String, Collectd::Threshold::Type],
+  instance => Optional[String[1]],
+  types    => Hash[String[1], Collectd::Threshold::Type],
 }]
diff --git a/types/threshold/type.pp b/types/threshold/type.pp
@@ -1,10 +1,10 @@
 type Collectd::Threshold::Type = Struct[{
-  instance    => Optional[String],
+  instance    => Optional[String[1]],
   failure_max => Optional[Numeric],
   warning_max => Optional[Numeric],
   failure_min => Optional[Numeric],
   warning_min => Optional[Numeric],
-  data_source => Optional[String],
+  data_source => Optional[String[1]],
   invert      => Optional[Boolean],
   persist     => Optional[Boolean],
   persist_ok  => Optional[Boolean],