(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 99549e6769842e747083c0561c2fcae0993538b9..123bb2f70e29e9c2c559c1c3fd455e252b39863b 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,13 +1,11 @@
 define apt::setting (
-  $type,
-  $priority   = 50,
-  $ensure     = file,
-  $source     = undef,
-  $content    = undef,
-  $file_perms = {},
-) {
+  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,36 +15,51 @@ define apt::setting (
     fail('apt::setting needs either of content or source')
   }
 
-  validate_re($type, ['conf', 'pref', 'list'])
-  validate_re($ensure,  ['file', 'present', 'absent'])
+  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), '-')
+
+  validate_re($setting_type, ['\Aconf\z', '\Apref\z', '\Alist\z'], "apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
 
   unless is_integer($priority) {
-    fail('apt::setting priority must be an integer')
+    # need this to allow zero-padded priority.
+    validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer')
   }
 
   if $source {
-    validate_string($source)
+    validate_legacy(String, 'validate_string', $source)
   }
 
   if $content {
-    validate_string($content)
+    validate_legacy(String, 'validate_string', $content)
   }
 
-  if $type == 'list' {
+  if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {
     $_priority = $priority
   }
 
-  $_path = $::apt::config_files[$type]['path']
-  $_ext  = $::apt::config_files[$type]['ext']
+  $_path = $::apt::config_files[$setting_type]['path']
+  $_ext  = $::apt::config_files[$setting_type]['ext']
+
+  if $notify_update {
+    $_notify = Class['apt::update']
+  } else {
+    $_notify = undef
+  }
 
-  file { "${_path}/${_priority}${title}${_ext}":
+  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,
   }
 }