Merge branch 'master' into add-epp-support

.github/workflows/ci.yml

@@ -4,7 +4,12 @@
 
 name: CI
 
-on: pull_request
+on:
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -13,6 +18,4 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
-    with:
-      pidfile_workaround: 'false'
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'saz'
     secrets:

.gitignore

@@ -21,3 +21,5 @@
 .*.sw?
 /.yardoc/
 /Guardfile
+bolt-debug.log
+.rerun.json

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '6.0.0'
+modulesync_config_version: '7.5.0'

.pmtignore

@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.0',  :require => false
+  gem 'puppet_metadata', '~> 4.0',  :require => false
 end
 
 group :development do
@@ -16,13 +16,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '~> 3.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false

REFERENCE.md

@@ -461,39 +461,39 @@ The following parameters are available in the `sudo::conf` defined type:
 
 ##### <a name="-sudo--conf--ensure"></a>`ensure`
 
-Data type: `Any`
+Data type: `Enum['present', 'absent']`
 
 Ensure if present or absent
 
 Default value: `present`
 
 ##### <a name="-sudo--conf--priority"></a>`priority`
 
-Data type: `Any`
+Data type: `Integer[0]`
 
 Prefix file name with $priority
 
 Default value: `10`
 
 ##### <a name="-sudo--conf--content"></a>`content`
 
-Data type: `Any`
+Data type: `Optional[Variant[Array[String[1]], String[1]]]`
 
 Content of configuration snippet
 
 Default value: `undef`
 
 ##### <a name="-sudo--conf--source"></a>`source`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Source of configuration snippet
 
 Default value: `undef`
 
 ##### <a name="-sudo--conf--template"></a>`template`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Path of a erb template file or epp template file without parameters
 
@@ -509,7 +509,7 @@ Default value: `undef`
 
 ##### <a name="-sudo--conf--sudo_config_dir"></a>`sudo_config_dir`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Where to place configuration snippets.
 Only set this, if your platform is not supported or
@@ -519,15 +519,15 @@ Default value: `undef`
 
 ##### <a name="-sudo--conf--sudo_file_name"></a>`sudo_file_name`
 
-Data type: `Any`
+Data type: `Optional[String[1]]`
 
 Set a custom file name for the snippet
 
 Default value: `undef`
 
 ##### <a name="-sudo--conf--sudo_syntax_path"></a>`sudo_syntax_path`
 
-Data type: `Any`
+Data type: `String[1]`
 
 Path to use for executing the sudo syntax check
 

manifests/conf.pp

@@ -38,15 +38,15 @@
 #   }
 #
 define sudo::conf (
-  $ensure           = present,
-  $priority         = 10,
-  $content          = undef,
-  $source           = undef,
-  $template         = undef,
-  $template_epp     = undef,
-  $sudo_config_dir  = undef,
-  $sudo_file_name   = undef,
-  $sudo_syntax_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+  Enum['present', 'absent']                                $ensure           = present,
+  Integer[0]                                               $priority         = 10,
+  Optional[Variant[Array[String[1]], String[1]]]           $content          = undef,
+  Optional[String[1]]                                      $source           = undef,
+  Optional[String[1]]                                      $template         = undef,
+  Optional[Struct[{ filename => String, params => Hash }]] $template_epp     = undef,
+  Optional[String[1]]                                      $sudo_config_dir  = undef,
+  Optional[String[1]]                                      $sudo_file_name   = undef,
+  String[1]                                                $sudo_syntax_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
 ) {
   include sudo
 

metadata.json

@@ -47,7 +47,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
 	"20.04",
 	"22.04"
       ]

spec/spec_helper.rb

@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }