From 8f1b7c2e74701031f2377e58355ed611392d6825 Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Mon, 8 Jan 2024 12:10:32 +0100 Subject: [PATCH 1/5] Remove deprecated function `validate_legacy` --- manifests/files.pp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index 6ef78e2..27ec7b6 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -32,23 +32,18 @@ # @petems - Peter Souter # define swap_file::files ( - $ensure = 'present', - $swapfile = '/mnt/swap.1', - $swapfilesize = $::memorysize, - $add_mount = true, - $options = 'defaults', - $timeout = 300, - $cmd = 'dd', - $resize_existing = false, - $resize_margin = '50MB', - $resize_verbose = false, -) -{ - # Parameter validation - validate_legacy(String, 'validate_re', $ensure, ['^absent$', '^present$']) - validate_legacy(String, 'validate_string', $swapfile) + Enum['present','absent'] $ensure = 'present', + Stdlib::Absolutefile $swapfile = '/mnt/swap.1', + String $swapfilesize = $::memorysize, + String $options = 'defaults', + String $cmd = 'dd', + String $resize_margin = '50MB', + Integer $timeout = 300, + Boolean $add_mount = true, + Boolean $resize_existing = false, + Boolean $resize_verbose = false, +) { $swapfilesize_mb = to_bytes($swapfilesize) / 1048576 - validate_legacy(Boolean, 'validate_bool', $add_mount) if $ensure == 'present' { From bd3da39ff2cefa2175fdc03274f63eac567f29ef Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Mon, 8 Jan 2024 12:16:01 +0100 Subject: [PATCH 2/5] Remove deprecated function `validate_legacy` --- manifests/swappiness.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/swappiness.pp b/manifests/swappiness.pp index 3b76ae8..1865f9f 100644 --- a/manifests/swappiness.pp +++ b/manifests/swappiness.pp @@ -10,11 +10,8 @@ # @author - Peter Souter # class swap_file::swappiness ( - $swappiness = 60, + Integer[0,100] $swappiness = 60, ) { - - validate_legacy(Integer, 'validate_integer', $swappiness, [100, 0]) - sysctl { 'vm.swappiness': ensure => 'present', value => $swappiness, From 888eb459f6a50c1e38d88481e95189bf542e85ba Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Mon, 8 Jan 2024 12:16:42 +0100 Subject: [PATCH 3/5] Remove deprecated functions `validate_legacy` and `hera_hash` (stdlib) --- manifests/init.pp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9486ba0..166e904 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -40,26 +40,13 @@ # @author - Peter Souter # class swap_file ( - $files = {}, - $files_hiera_merge = false, + Hash $files = {}, + Variant[Enum['Y','y','1','T','t','TRUE','true','0','F','f','N','n','false','FALSE'], 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) - } - validate_legacy(Boolean, 'validate_bool', $files_hiera_merge_bool) - - # functionality - if $files_hiera_merge_bool == true { - $files_real = hiera_hash('swap_file::files', {}) + if str2bool($files_hiera_merge) { + $files_real = lookup('swap_file::files', Hash, { strategy => 'hash' }) } else { $files_real = $files } - if $files_real != undef { - validate_legacy(Hash, 'validate_hash', $files_real) - create_resources('swap_file::files', $files_real) - } + create_resources('swap_file::files', $files_real) } From 35b86ee6cc8947ea03a78e4a85485fd87529b6a6 Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Wed, 10 Jan 2024 11:57:45 +0100 Subject: [PATCH 4/5] Remove deprecated functions: `is_hash` and `has_key` (removed on stdlib 9.x) --- manifests/files.pp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index 27ec7b6..7055052 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -46,12 +46,9 @@ $swapfilesize_mb = to_bytes($swapfilesize) / 1048576 if $ensure == 'present' { - if ($resize_existing and $::swapfile_sizes) { - - if (is_hash($::swapfile_sizes)) { - - if (has_key($::swapfile_sizes,$swapfile)) { + if $::swapfile_sizes =~ Hash { + if $swapfile in $::swapfile_sizes { ::swap_file::resize { $swapfile: swapfile_path => $swapfile, margin => $resize_margin, @@ -61,7 +58,6 @@ before => Exec["Create swap file ${swapfile}"], } } - } else { $existing_swapfile_size = swap_file_size_from_csv($swapfile,$::swapfile_sizes_csv) if ($existing_swapfile_size) { From a2ff99f95a9ac48da5019a0d6158fb835839b366 Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Wed, 17 Jan 2024 11:36:45 +0100 Subject: [PATCH 5/5] Fixed various errors reported by linter --- manifests/files.pp | 16 ++++++++-------- manifests/init.pp | 2 +- manifests/resize.pp | 8 +++----- manifests/swappiness.pp | 1 - 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/manifests/files.pp b/manifests/files.pp index 7055052..873605b 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -33,8 +33,8 @@ # define swap_file::files ( Enum['present','absent'] $ensure = 'present', - Stdlib::Absolutefile $swapfile = '/mnt/swap.1', - String $swapfilesize = $::memorysize, + Stdlib::Absolutepath $swapfile = '/mnt/swap.1', + String $swapfilesize = $facts['memory']['system']['total'], String $options = 'defaults', String $cmd = 'dd', String $resize_margin = '50MB', @@ -46,20 +46,20 @@ $swapfilesize_mb = to_bytes($swapfilesize) / 1048576 if $ensure == 'present' { - if ($resize_existing and $::swapfile_sizes) { - if $::swapfile_sizes =~ Hash { - if $swapfile in $::swapfile_sizes { + if ($resize_existing and $facts['swapfile_sizes']) { + if $facts['swapfile_sizes'] =~ Hash { + if $swapfile in $facts['swapfile_sizes'] { ::swap_file::resize { $swapfile: swapfile_path => $swapfile, margin => $resize_margin, expected_swapfile_size => $swapfilesize, - actual_swapfile_size => $::swapfile_sizes[$swapfile], + actual_swapfile_size => $facts['swapfile_sizes[$swapfile]'], verbose => $resize_verbose, before => Exec["Create swap file ${swapfile}"], } } } else { - $existing_swapfile_size = swap_file_size_from_csv($swapfile,$::swapfile_sizes_csv) + $existing_swapfile_size = swap_file_size_from_csv($swapfile,$facts['swapfile_sizes_csv']) if ($existing_swapfile_size) { ::swap_file::resize { $swapfile: swapfile_path => $swapfile, @@ -95,7 +95,7 @@ require => Exec["Create swap file ${swapfile}"], } - if $::selinux { + if $facts['os']['selinux']['enabled'] { File[$swapfile] { seltype => 'swapfile_t', } diff --git a/manifests/init.pp b/manifests/init.pp index 166e904..3c614fe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -44,7 +44,7 @@ Variant[Enum['Y','y','1','T','t','TRUE','true','0','F','f','N','n','false','FALSE'], Boolean] $files_hiera_merge = false, ) { if str2bool($files_hiera_merge) { - $files_real = lookup('swap_file::files', Hash, { strategy => 'hash' }) + $files_real = lookup('swap_file::files', Hash, { strategy => 'hash' }) } else { $files_real = $files } diff --git a/manifests/resize.pp b/manifests/resize.pp index 2dbe176..51f7ab1 100644 --- a/manifests/resize.pp +++ b/manifests/resize.pp @@ -21,8 +21,7 @@ $actual_swapfile_size, $margin = '50MB', $verbose = false, -) -{ +) { $margin_bytes = to_bytes($margin) $existing_swapfile_bytes = to_bytes("${actual_swapfile_size}kb") $expected_swapfile_size_bytes = to_bytes($expected_swapfile_size) @@ -31,7 +30,7 @@ if !(difference_within_margin([$existing_swapfile_bytes, $expected_swapfile_size_bytes],$margin_bytes)) { if ($verbose) { $alert_message = "Existing : ${existing_swapfile_bytes}B\nExpected: ${expected_swapfile_size_bytes}B\nMargin: ${margin_bytes}B" - notify{"Resizing Swapfile Alert ${swapfile_path}": + notify { "Resizing Swapfile Alert ${swapfile_path}": name => $alert_message, } } @@ -41,9 +40,8 @@ } -> exec { "Purge ${swapfile_path} for resize": command => "/bin/rm -f ${swapfile_path}", onlyif => "test -f ${swapfile_path}", - path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ], + path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'], } } } - } diff --git a/manifests/swappiness.pp b/manifests/swappiness.pp index 1865f9f..928e1bf 100644 --- a/manifests/swappiness.pp +++ b/manifests/swappiness.pp @@ -16,5 +16,4 @@ ensure => 'present', value => $swappiness, } - }