(maint) Stub fact exists call with argument passed

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

diff --git a/manifests/key.pp b/manifests/key.pp
index 914ec88ca4e92f1861899a76c33cd7938b6e76de..9a244b5065ac049c58722fb8e56e8fb6258f1669 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,48 +1,48 @@
 # == Define: apt::key
 define apt::key (
-  $id          = $title,
-  $ensure      = present,
-  $content     = undef,
-  $source      = undef,
-  $server      = $::apt::keyserver,
-  $options     = undef,
-  $key         = undef,
-  $key_content = undef,
-  $key_source  = undef,
-  $key_server  = undef,
-  $key_options = undef,
-) {
+    Variant[String, Stdlib::Compat::String] $id                                         = $title,
+    Enum['present', 'absent'] $ensure                                                   = present,
+    Optional[Variant[String, Stdlib::Compat::String]] $content                          = undef,
+    Optional[Variant[String, Stdlib::Compat::String]] $source                           = undef,
+    Variant[String, Stdlib::Compat::String] $server                                     = $::apt::keyserver,
+    Optional[Variant[String, Stdlib::Compat::String]] $options                          = undef,
+    Optional[Variant[String, Stdlib::Compat::String, Hash, Stdlib::Compat::Hash]] $key  = undef,
+    Optional[Variant[String, Stdlib::Compat::String]] $key_content                      = undef,
+    Optional[Variant[String, Stdlib::Compat::String]] $key_source                       = undef,
+    Optional[Variant[String, Stdlib::Compat::String]] $key_server                       = undef,
+    Optional[Variant[String, Stdlib::Compat::String]] $key_options                      = undef,
+    ) {
 
   if $key != undef {
-    warning('$key is deprecated and will be removed in the next major release. Please use $id instead.')
+    deprecation('apt $key', '$key is deprecated and will be removed in the next major release. Please use $id instead.')
     $_id = $key
   } else {
     $_id = $id
   }
 
   if $key_content != undef {
-    warning('$key_content is deprecated and will be removed in the next major release. Please use $content instead.')
+    deprecation('apt $key_content', '$key_content is deprecated and will be removed in the next major release. Please use $content instead.')
     $_content = $key_content
   } else {
     $_content = $content
   }
 
   if $key_source != undef {
-    warning('$key_source is deprecated and will be removed in the next major release. Please use $source instead.')
+    deprecation('apt $key_source', '$key_source is deprecated and will be removed in the next major release. Please use $source instead.')
     $_source = $key_source
   } else {
     $_source = $source
   }
 
   if $key_server != undef {
-    warning('$key_server is deprecated and will be removed in the next major release. Please use $server instead.')
+    deprecation('apt $key_server', '$key_server is deprecated and will be removed in the next major release. Please use $server instead.')
     $_server = $key_server
   } else {
     $_server = $server
   }
 
   if $key_options != undef {
-    warning('$key_options is deprecated and will be removed in the next major release. Please use $options instead.')
+    deprecation('apt $key_options', '$key_options is deprecated and will be removed in the next major release. Please use $options instead.')
     $_options = $key_options
   } else {
     $_options = $options
@@ -52,7 +52,7 @@ define apt::key (
   validate_re($ensure, ['\A(absent|present)\Z',])
 
   if $_content {
-    validate_string($_content)
+    validate_legacy(String, 'validate_string', $_content)
   }
 
   if $_source {
@@ -64,7 +64,7 @@ define apt::key (
   }
 
   if $_options {
-    validate_string($_options)
+    validate_legacy(String, 'validate_string', $_options)
   }
 
   case $ensure {
@@ -81,8 +81,7 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} present": }
+        } -> anchor { "apt_key ${_id} present": }
       }
     }
 
@@ -99,8 +98,7 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} absent": }
+        } -> anchor { "apt_key ${_id} absent": }
       }
     }