Update modulesync and fix test

.fixtures.yml

@@ -1,3 +1,4 @@
+---
 fixtures:
   repositories:
     stdlib:

.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 }}

.msync.yml

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

manifests/files.pp

@@ -33,15 +33,15 @@
 #
 define swap_file::files (
   Enum['absent','present'] $ensure = 'present',
-  Stdlib::Unixpath $swapfile       = '/mnt/swap.1',
+  Stdlib::Absolutepath $swapfile   = '/mnt/swap.1',
   $swapfilesize                    = $facts['memory']['system']['total'],
   Boolean $add_mount               = true,
-  $options                         = 'defaults',
+  String $options                  = 'defaults',
   $timeout                         = 300,
-  $cmd                             = 'dd',
-  $resize_existing                 = false,
+  String $cmd                      = 'dd',
+  Boolean $resize_existing         = false,
   $resize_margin                   = '50MB',
-  $resize_verbose                  = false,
+  Boolean $resize_verbose          = false,
 ) {
   # Parameter validation
   $swapfilesize_mb = to_bytes($swapfilesize) / 1048576

manifests/init.pp

@@ -40,19 +40,12 @@
 # @author - Peter Souter
 #
 class swap_file (
-  Hash $files                                              = {},
-  Variant[Boolean,Enum['true','false']] $files_hiera_merge = false,
+  Hash $files             = {},
+  Boolean $files_hiera_merge = false,
 ) {
-  # variable handling
-  if $files_hiera_merge =~ Boolean {
-    $files_hiera_merge_bool = $files_hiera_merge
-  } else {
-    $files_hiera_merge_bool = str2bool($files_hiera_merge)
-  }
-
   # functionality
-  if $files_hiera_merge_bool == true {
-    $files_real = lookup('swap_file::files', Hash, 'deep', {})
+  if $files_hiera_merge {
+    $files_real = hiera_hash('swap_file::files', {})
   } else {
     $files_real = $files
   }

manifests/resize.pp

@@ -16,11 +16,11 @@
 # @author - Peter Souter
 #
 define swap_file::resize (
-  $swapfile_path,
+  Stdlib::Absolutepath $swapfile_path,
   $expected_swapfile_size,
   $actual_swapfile_size,
-  $margin                 = '50MB',
-  $verbose                = false,
+  $margin                             = '50MB',
+  Boolean $verbose                    = false,
 ) {
   $margin_bytes                  = to_bytes($margin)
   $existing_swapfile_bytes       = to_bytes("${actual_swapfile_size}kb")

metadata.json

@@ -11,23 +11,31 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "7",
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "12.04",
-        "14.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],

spec/acceptance/swap_file_class_spec.rb

@@ -2,49 +2,59 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'swap_file' do
-    context 'ensure => present' do
-      it 'works with no errors' do
-        pp = <<-EOS
-        class { 'swap_file':
-          files => {
-            'swapfile' => {
-              ensure => 'present',
-            },
-            'use fallocate' => {
-              swapfile => '/tmp/swapfile.fallocate',
-              cmd      => 'fallocate',
-            },
-            'remove swap file' => {
-              ensure   => 'absent',
-              swapfile => '/tmp/swapfile.old',
-            },
-          },
-        }
-        EOS
-
-        # Run it twice and test for idempotency
-        apply_manifest(pp, catch_failures: true)
-        apply_manifest(pp, catch_changes: true)
-      end
-
-      it 'contains the default swapfile' do
-        shell('/sbin/swapon -s | grep /mnt/swap.1', acceptable_exit_codes: [0])
-      end
+describe 'swap_file class' do
+  after(:all) do
+    pp = <<-EOS
+    class { 'swap_file':
+      files => {
+        'swapfile' => {
+          ensure => 'absent',
+        },
+        'use fallocate' => {
+          swapfile => '/tmp/swapfile.fallocate',
+          cmd      => 'fallocate',
+          ensure   => absent,
+        },
+        'remove swap file' => {
+          ensure   => 'absent',
+          swapfile => '/tmp/swapfile.old',
+        },
+      },
+    }
+    EOS
 
-      it 'contains the default fstab setting' do
-        shell('cat /etc/fstab | grep /mnt/swap.1', acceptable_exit_codes: [0])
-        shell('cat /etc/fstab | grep defaults', acceptable_exit_codes: [0])
-      end
+    apply_manifest(pp, catch_failures: true)
+  end
 
-      it 'contains the default swapfile' do
-        shell('/sbin/swapon -s | grep /tmp/swapfile.fallocate', acceptable_exit_codes: [0])
+  context 'with multiple files config' do
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-PUPPET
+          class { 'swap_file':
+            files => {
+              'swapfile' => {
+                ensure => 'present',
+              },
+              'use fallocate' => {
+                swapfile     => '/tmp/swapfile.fallocate',
+                cmd          => 'fallocate',
+                swapfilesize => '100MB'
+              },
+              'remove swap file' => {
+                ensure       => 'absent',
+                swapfile     => '/tmp/swapfile.old',
+                swapfilesize => '100MB'
+              },
+            },
+          }
+        PUPPET
       end
+    end
 
-      it 'contains the default fstab setting' do
-        shell('cat /etc/fstab | grep /tmp/swapfile.fallocate', acceptable_exit_codes: [0])
-      end
+    describe file('/etc/fstab'), shell('/sbin/swapon -s') do
+      its(:content) { is_expected.to match %r{/mnt/swap.1} }
+      its(:content) { is_expected.to match %r{/tmp/swapfile.fallocate} }
+      its(:content) { is_expected.not_to match %r{/tmp/swapfile.old} }
     end
   end
 end