Merge branch 'enhancement/add-rspec-tests-for-function-attributes-486…

…' into v2.x

examples/init_api.pp

@@ -8,12 +8,12 @@
 
 include ::icinga2::pki::ca
 
-::icinga2::object::apiuser { 'director':
-  ensure      => present,
-  password    => 'Eih5Weefoo2oa8sh', 
-  permissions => [ "*" ],
-  target      => '/etc/icinga2/conf.d/api-users.conf',
-}
+#::icinga2::object::apiuser { 'director':
+#  ensure      => present,
+#  password    => 'Eih5Weefoo2oa8sh', 
+#  permissions => [ "*" ],
+#  target      => '/etc/icinga2/conf.d/api-users.conf',
+#}
 
 ::icinga2::object::apiuser { 'icingaweb2':
   ensure      => present,

lib/puppet/parser/functions/icinga2_attributes.rb

@@ -2,7 +2,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:icinga2_attributes, :type => :rvalue) do |args|
-    raise Puppet::ParseError, 'Must provide at least one argument.' if args.length > 4
+    raise Puppet::ParseError, 'icinga2_atributes(): Must provide at least one argument.' if args.length > 4 || args.length < 1
 
     if args[1]
       indent = args[1]

lib/puppet_x/icinga2/utils.rb

@@ -86,7 +86,7 @@ def self.attributes(attrs, globals, consts, indent=2)
 
         def self.value_types(value)
 
-          if value =~ /^\d+\.?\d*[dhms]?$/ || value =~ /^(true|false|null)$/ || value =~ /^!?(host|service|user)\./ || value =~ /^\{{2}.*\}{2}$/
+          if value =~ /^-?\d+\.?\d*[dhms]?$/ || value =~ /^(true|false|null)$/ || value =~ /^!?(host|service|user)\./ || value =~ /^\{{2}.*\}{2}$/
             result = value
           else
             if $constants.index { |x| if $hash_attrs.include?(x) then value =~ /^!?(#{x})(\..+$|$)/ else value =~ /^!?#{x}$/ end }

manifests/feature/api.pp

@@ -159,6 +159,9 @@
 class icinga2::feature::api(
   Enum['absent', 'present']                               $ensure                           = present,
   Enum['ca', 'icinga2', 'none', 'puppet']                 $pki                              = 'puppet',
+  Optional[Stdlib::Absolutepath]                          $ssl_key_path                     = undef,
+  Optional[Stdlib::Absolutepath]                          $ssl_cert_path                    = undef,
+  Optional[Stdlib::Absolutepath]                          $ssl_cacert_path                  = undef,
   Optional[Stdlib::Absolutepath]                          $ssl_crl_path                     = undef,
   Optional[Boolean]                                       $accept_config                    = undef,
   Optional[Boolean]                                       $accept_commands                  = undef,
@@ -343,7 +346,7 @@
     order       => 10,
     notify      => $_notify,
   }
-
+ 
   # manage feature
   icinga2::feature { 'api':
     ensure      => $ensure,

manifests/feature/idomysql.pp

@@ -307,8 +307,8 @@
     exec { 'idomysql-import-schema':
       user    => 'root',
       path    => $::path,
-      command => "mysql -h '${host}' -P '${port}' -u '${user}' -p'${password}' '${database}' < '${ido_mysql_schema_dir}/mysql.sql'",
-      unless  => "mysql -h '${host}' -P '${port}' -u '${user}' -p'${password}' '${database}' -Ns -e 'select version from icinga_dbversion'",
+      command => "mysql -h ${host} -P ${port} -u ${user} -p'${password}' ${database} < ${ido_mysql_schema_dir}/mysql.sql",
+      unless  => "mysql -h ${host} -P ${port} -u ${user} -p'${password}' ${database} -Ns -e 'select version from icinga_dbversion'",
     }
   }
 

manifests/feature/influxdb.pp

@@ -145,7 +145,7 @@
   $service_template = { measurement => $service_measurement, tags => $service_tags}
 
   if $enable_ssl {
-  
+
     # Set defaults for certificate stuff
     if $ssl_key_path {
       $_ssl_key_path = $ssl_key_path }

manifests/feature/statusdata.pp

@@ -26,8 +26,8 @@
 class icinga2::feature::statusdata(
   Enum['absent', 'present']          $ensure          = present,
   Optional[Stdlib::Absolutepath]     $status_path     = undef,
-  Optiona[Stdlib::Absolutepath]      $objects_path    = undef,
-  Optiona[Pattern[/^\d+[ms]*$/]]     $update_interval = undef,
+  Optional[Stdlib::Absolutepath]     $objects_path    = undef,
+  Optional[Pattern[/^\d+[ms]*$/]]    $update_interval = undef,
 ) {
 
   if ! defined(Class['::icinga2']) {

manifests/object/apiuser.pp

@@ -32,7 +32,7 @@
 # ::icinga2::object::apiuser { 'director':
 #   ensure      => present,
 #   password    => 'Eih5Weefoo2oa8sh',
-#   permissions => [ "*" ],
+#   permissions => [ '*' ],
 #   target      => '/etc/icinga2/conf.d/api-users.conf',
 # }
 #
@@ -62,9 +62,9 @@
 #
 define icinga2::object::apiuser(
   Stdlib::Absolutepath        $target,
-  Array                       $permissions,
   Enum['absent', 'present']   $ensure       = present,
   String                      $apiuser_name = $title,
+  Optional[Array]             $permissions  = undef,
   Optional[String]            $password     = undef,
   Optional[String]            $client_cn    = undef,
   Variant[String, Integer]    $order        = 30,
@@ -86,6 +86,5 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/checkcommand.pp

@@ -73,6 +73,5 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/checkresultreader.pp

@@ -43,7 +43,6 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 
   # import library

manifests/object/compatlogger.pp

@@ -45,7 +45,6 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 
   # import library

manifests/object/dependency.pp

@@ -125,7 +125,6 @@
     ignore       => $ignore,
     target       => $target,
     order        => $order,
-    notify       => Class['::icinga2::service'],
   }
 
 }

manifests/object/endpoint.pp

@@ -66,6 +66,5 @@
     attrs_list  => keys($attrs),
     target      => $_target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/eventcommand.pp

@@ -74,6 +74,5 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/host.pp

@@ -185,6 +185,5 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/hostgroup.pp

@@ -65,6 +65,5 @@
     ignore      => $ignore,
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 }

manifests/object/notification.pp

@@ -140,7 +140,6 @@
     apply_target => $apply_target,
     assign       => $assign,
     ignore       => $ignore,
-    notify       => Class['::icinga2::service'],
   }
 
 }

manifests/object/notificationcommand.pp

@@ -80,7 +80,6 @@
     attrs_list  => keys($attrs),
     target      => $target,
     order       => $order,
-    notify      => Class['::icinga2::service'],
   }
 
 }

manifests/object/scheduleddowntime.pp

@@ -99,7 +99,6 @@
     ignore       => $ignore,
     target       => $target,
     order        => $order,
-    notify       => Class['::icinga2::service'],
   }
 
 }

manifests/object/service.pp

@@ -146,7 +146,7 @@
 #
 #   ::icinga2::object::service { 'linux_disks':
 #     import           => ['generic-service'],
-#     apply            =>  'disk_name =>config in host.vars.disks',
+#     apply            =>  'disk_name => config in host.vars.disks',
 #     check_command    => 'disk',
 #     command_endpoint => 'host.name',
 #     vars             => 'vars + config',
@@ -228,19 +228,18 @@
 
   # create object
   icinga2::object { "icinga2::object::Service::${title}":
-    ensure       => $ensure,
-    object_name  => $service_name,
-    object_type  => 'Service',
-    import       => $import,
-    apply        => $apply,
-    prefix       => $prefix,
-    assign       => $assign,
-    ignore       => $ignore,
-    template     => $template,
-    attrs        => delete_undef_values($attrs),
-    attrs_list   => keys($attrs),
-    target       => $target,
-    order        => $order,
-    notify       => Class['::icinga2::service'],
+    ensure      => $ensure,
+    object_name => $service_name,
+    object_type => 'Service',
+    import      => $import,
+    apply       => $apply,
+    prefix      => $prefix,
+    assign      => $assign,
+    ignore      => $ignore,
+    template    => $template,
+    attrs       => delete_undef_values($attrs),
+    attrs_list  => keys($attrs),
+    target      => $target,
+    order       => $order,
   }
 }