(maint) Stub fact exists call with argument passed

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

diff --git a/manifests/setting.pp b/manifests/setting.pp
index c288b35d7ec00ce545af777de09bfe977026738c..123bb2f70e29e9c2c559c1c3fd455e252b39863b 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,13 +1,11 @@
 define apt::setting (
-  $priority      = 50,
-  $ensure        = file,
-  $source        = undef,
-  $content       = undef,
-  $file_perms    = {},
-  $notify_update = true,
-) {
+  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,
 
-  $_file = merge($::apt::file_defaults, $file_perms)
+) {
 
   if $content and $source {
     fail('apt::setting cannot have both content and source')
@@ -17,8 +15,9 @@ define apt::setting (
     fail('apt::setting needs either of content or source')
   }
 
-  validate_re($ensure,  ['file', 'present', 'absent'])
-  validate_bool($notify_update)
+  if $notify_update {
+    validate_legacy(Boolean, 'validate_bool', $notify_update)
+  }
 
   $title_array = split($title, '-')
   $setting_type = $title_array[0]
@@ -32,14 +31,14 @@ define apt::setting (
   }
 
   if $source {
-    validate_string($source)
+    validate_legacy(String, 'validate_string', $source)
   }
 
   if $content {
-    validate_string($content)
+    validate_legacy(String, 'validate_string', $content)
   }
 
-  if $setting_type == 'list' {
+  if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {
     $_priority = $priority
@@ -49,24 +48,18 @@ define apt::setting (
   $_ext  = $::apt::config_files[$setting_type]['ext']
 
   if $notify_update {
-    $_notify = Exec['apt_update']
+    $_notify = Class['apt::update']
   } else {
     $_notify = undef
   }
 
   file { "${_path}/${_priority}${base_name}${_ext}":
     ensure  => $ensure,
-    owner   => $_file['owner'],
-    group   => $_file['group'],
-    mode    => $_file['mode'],
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,
   }
-
-  if $notify_update {
-    anchor { "apt::setting::${name}":
-      require => Class['apt::update']
-    }
-  }
 }