Removal of compat types and validate_legacy calls

[puppet-modules/puppetlabs-apt.git] / manifests / setting.pp

diff --git a/manifests/setting.pp b/manifests/setting.pp
index 123bb2f70e29e9c2c559c1c3fd455e252b39863b..74ef1eabbc0523494156f3390e159d59ff195539 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,10 +1,9 @@
 define apt::setting (
-  Variant[String, Stdlib::Compat::String, Integer, Stdlib::Compat::Integer, Array, Stdlib::Compat::Array] $priority = 50,
-  Optional[Enum['file', 'present', 'absent']] $ensure                                                               = file,
-  Optional[Variant[String, Stdlib::Compat::String]] $source                                                         = undef,
-  Optional[Variant[String, Stdlib::Compat::String]] $content                                                        = undef,
-  Optional[Boolean] $notify_update                                                                                  = true,
-
+  Variant[String, Integer] $priority                  = 50,
+  Optional[Enum['file', 'present', 'absent']] $ensure = file,
+  Optional[String] $source                            = undef,
+  Optional[String] $content                           = undef,
+  Boolean $notify_update                              = true,
 ) {
 
   if $content and $source {
@@ -15,10 +14,6 @@ define apt::setting (
     fail('apt::setting needs either of content or source')
   }
 
-  if $notify_update {
-    validate_legacy(Boolean, 'validate_bool', $notify_update)
-  }
-
   $title_array = split($title, '-')
   $setting_type = $title_array[0]
   $base_name = join(delete_at($title_array, 0), '-')
@@ -30,14 +25,6 @@ define apt::setting (
     validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer')
   }
 
-  if $source {
-    validate_legacy(String, 'validate_string', $source)
-  }
-
-  if $content {
-    validate_legacy(String, 'validate_string', $content)
-  }
-
   if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {