Remove deprecated functions (validate_legacy, hiera_hash, is_hash and has_key)

manifests/files.pp

@@ -32,43 +32,34 @@
 #    @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::Absolutepath     $swapfile        = '/mnt/swap.1',
+  String                   $swapfilesize    = $facts['memory']['system']['total'],
+  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' {
-
-    if ($resize_existing and $::swapfile_sizes) {
-
-      if (is_hash($::swapfile_sizes)) {
-
-        if (has_key($::swapfile_sizes,$swapfile)) {
+    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,
@@ -104,7 +95,7 @@
       require => Exec["Create swap file ${swapfile}"],
     }
 
-    if $::selinux {
+    if $facts['os']['selinux']['enabled'] {
       File[$swapfile] {
         seltype => 'swapfile_t',
       }

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

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/'],
       }
     }
   }
-
 }

manifests/swappiness.pp

@@ -10,14 +10,10 @@
 # @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,
   }
-
 }