From 63fa492abe8132672db10afca63dfd7c213250ed Mon Sep 17 00:00:00 2001
From: Andrew Bramble <andrew.bramble@katana1.com>
Date: Mon, 23 Oct 2017 11:51:44 +1100
Subject: [PATCH] *fix* add puppet param types to all blackbox_exporter params

---
 manifests/blackbox_exporter.pp | 53 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/manifests/blackbox_exporter.pp b/manifests/blackbox_exporter.pp
index 10e687af9..4c939f096 100644
--- a/manifests/blackbox_exporter.pp
+++ b/manifests/blackbox_exporter.pp
@@ -46,8 +46,7 @@
 #  Whether to create user or rely on external code for that
 #
 #  [*modules*]
-#  Structured, hash of blackbox module definitions for different probe types, converted 
-#  to yaml for blackbox config file
+#  Structured, array of blackbox module definitions for different probe types
 #
 #  [*os*]
 #  Operating system (linux is the only one supported)
@@ -90,31 +89,31 @@
 #     prober: tcp
 #     preferred_ip_protocol: ip4
 class prometheus::blackbox_exporter (
-  Hash $modules              = {},
-  $arch                      = $::prometheus::params::arch,
-  $bin_dir                   = $::prometheus::params::bin_dir,
-  $config_file               = $::prometheus::params::blackbox_exporter_config_file,
-  $config_mode               = $::prometheus::params::config_mode,
-  $download_extension        = $::prometheus::params::blackbox_exporter_download_extension,
-  $download_url              = undef,
-  $download_url_base         = $::prometheus::params::blackbox_exporter_download_url_base,
-  $extra_groups              = $::prometheus::params::blackbox_exporter_extra_groups,
-  $extra_options             = '',
-  $group                     = $::prometheus::params::blackbox_exporter_group,
-  $init_style                = $::prometheus::params::init_style,
-  $install_method            = $::prometheus::params::install_method,
-  Boolean $manage_group      = true,
-  Boolean $manage_service    = true,
-  Boolean $manage_user       = true,
-  $os                        = $::prometheus::params::os,
-  $package_ensure            = $::prometheus::params::blackbox_exporter_package_ensure,
-  $package_name              = $::prometheus::params::blackbox_exporter_package_name,
-  Boolean $restart_on_change = true,
-  Boolean $service_enable    = true,
-  $service_ensure            = 'running',
-  $service_name              = 'blackbox_exporter',
-  $user                      = $::prometheus::params::blackbox_exporter_user,
-  $version                   = $::prometheus::params::blackbox_exporter_version,
+  Hash $modules                       = {},
+  String $arch                        = $::prometheus::params::arch,
+  String $bin_dir                     = $::prometheus::params::bin_dir,
+  String $config_file                 = $::prometheus::params::blackbox_exporter_config_file,
+  String $config_mode                 = $::prometheus::params::config_mode,
+  String $download_extension          = $::prometheus::params::blackbox_exporter_download_extension,
+  Variant[Undef,String] $download_url = undef,
+  String $download_url_base           = $::prometheus::params::blackbox_exporter_download_url_base,
+  Array[String] $extra_groups         = $::prometheus::params::blackbox_exporter_extra_groups,
+  String $extra_options               = '',
+  String $group                       = $::prometheus::params::blackbox_exporter_group,
+  String $init_style                  = $::prometheus::params::init_style,
+  String $install_method              = $::prometheus::params::install_method,
+  Boolean $manage_group               = true,
+  Boolean $manage_service             = true,
+  Boolean $manage_user                = true,
+  String $os                          = $::prometheus::params::os,
+  String $package_ensure              = $::prometheus::params::blackbox_exporter_package_ensure,
+  String $package_name                = $::prometheus::params::blackbox_exporter_package_name,
+  Boolean $restart_on_change          = true,
+  Boolean $service_enable             = true,
+  String $service_ensure              = 'running',
+  String $service_name                = 'blackbox_exporter',
+  String $user                        = $::prometheus::params::blackbox_exporter_user,
+  String $version                     = $::prometheus::params::blackbox_exporter_version,
 ) inherits prometheus::params {
   # Prometheus added a 'v' on the release name at 0.1.0 of blackbox
   if versioncmp ($version, '0.1.0') >= 0 {