improve tests, allow puppet 7/8

Author: saz

.fixtures.yml

@@ -0,0 +1,3 @@
+fixtures:
+  repositories:
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"

manifests/config.pp

@@ -1,16 +1,11 @@
-# == Class: rsyslog::config
+# @summary
+#   Manages rsyslog configuration
 #
-# Full description of class role here.
-#
-# === Parameters
-#
-# === Variables
-#
-# === Examples
-#
-#  class { 'rsyslog::config': }
+# @api private
 #
 class rsyslog::config {
+  assert_private()
+
   File {
     owner   => 'root',
     group   => $rsyslog::run_group,

manifests/install.pp

@@ -1,16 +1,11 @@
-# == Class: rsyslog::install
+# @summary
+#   Manages rsyslog packages
 #
-# This class makes sure that the required packages are installed
-#
-# === Parameters
-#
-# === Variables
-#
-# === Examples
-#
-#  class { 'rsyslog::install': }
+# @api private
 #
 class rsyslog::install {
+  assert_private()
+
   if $rsyslog::rsyslog_package_name != false {
     package { $rsyslog::rsyslog_package_name:
       ensure => $rsyslog::package_status,

metadata.json

@@ -33,9 +33,6 @@
     {
       "operatingsystem": "OracleLinux"
     },
-    {
-      "operatingsystem": "Scientific"
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
@@ -69,6 +66,9 @@
   ],
   "description": "Manage rsyslog client and server via Puppet",
   "dependencies": [
-
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 9.0.0 < 10.0.0"
+    }
   ]
 }

spec/classes/rsyslog_spec.rb

@@ -19,6 +19,8 @@
       service_name = 'rsyslog'
       rsyslog_conf = '/etc/rsyslog.conf'
       im_journal_ratelimit_burst = nil
+      rsyslog_default = '/etc/default/rsyslog'
+      spool_dir = '/var/spool/rsyslog'
 
       case facts[:os]['family']
       when 'FreeBSD'
@@ -27,13 +29,18 @@
         rsyslog_d = '/usr/local/etc/rsyslog.d'
         service_name = 'rsyslogd'
         rsyslog_conf = '/usr/local/etc/rsyslog.conf'
+        rsyslog_default = '/etc/defaults/syslogd'
       when 'Gentoo'
         rsyslog_package = 'app-admin/rsyslog'
         relp_package = nil
+        rsyslog_default = '/etc/conf.d/rsyslog'
       when 'Suse'
         relp_package = nil
         service_name = 'syslog'
+        rsyslog_default = '/etc/sysconfig/syslog'
       when 'RedHat'
+        rsyslog_default = '/etc/sysconfig/rsyslog'
+        spool_dir = '/var/lib/rsyslog'
         case facts[:os]['name']
         when 'Amazon'
           relp_package = nil
@@ -51,13 +58,15 @@
           is_expected.to contain_class('rsyslog::service').that_subscribes_to('Class[rsyslog::config]')
           is_expected.to contain_package(rsyslog_package)
           is_expected.to contain_package(relp_package) if relp_package
-          is_expected.to contain_file(rsyslog_d)
+          is_expected.to contain_file(rsyslog_d).with_ensure('directory')
           is_expected.to contain_service(service_name)
           if im_journal_ratelimit_burst
             is_expected.to contain_file(rsyslog_conf).with_content(%r{\$imjournalRatelimitBurst #{im_journal_ratelimit_burst}})
           else
             is_expected.to contain_file(rsyslog_conf).without_content(%r{\$imjournalRatelimitBurst})
           end
+          is_expected.to contain_file(rsyslog_default).with_ensure('file')
+          is_expected.to contain_file(spool_dir).with_ensure('directory')
         end
       end