Merge pull request #666 from HelenCampbell/release

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

diff --git a/manifests/key.pp b/manifests/key.pp
index 8fbb47abd0b846aa9fd4ef47a6b46c60e73df1f4..d4a1d802adfa75089417362dd56fb15bf45e1228 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -14,42 +14,42 @@ define apt::key (
 ) {
 
   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
   }
 
   validate_re($_id, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
-  validate_re($ensure, ['\Aabsent|present\Z',])
+  validate_re($ensure, ['\A(absent|present)\Z',])
 
   if $_content {
     validate_string($_content)
@@ -81,8 +81,8 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} present": }
+        }
+        -> anchor { "apt_key ${_id} present": }
       }
     }
 
@@ -99,8 +99,8 @@ define apt::key (
           content => $_content,
           server  => $_server,
           options => $_options,
-        } ->
-        anchor { "apt_key ${_id} absent": }
+        }
+        -> anchor { "apt_key ${_id} absent": }
       }
     }