keyring: remove the file param

Being able to provide the dir, filename, and full file path makes the
logic too complicated for users of this defined type. We should only
allow providing the filename and dir, and then compute the full path
from those. Otherwise, someone could pass all three parameters, in which
case the filename and dir would be ignored, which could be confusing.

Author: kenyon

REFERENCE.md

@@ -662,7 +662,6 @@ The following parameters are available in the `apt::keyring` defined type:
 
 * [`dir`](#-apt--keyring--dir)
 * [`filename`](#-apt--keyring--filename)
-* [`file`](#-apt--keyring--file)
 * [`mode`](#-apt--keyring--mode)
 * [`source`](#-apt--keyring--source)
 * [`content`](#-apt--keyring--content)
@@ -684,14 +683,6 @@ Optional filename for the keyring. It should also contain extension along with t
 
 Default value: `$name`
 
-##### <a name="-apt--keyring--file"></a>`file`
-
-Data type: `Stdlib::Absolutepath`
-
-File path of the keyring.
-
-Default value: `"${dir}/${filename}"`
-
 ##### <a name="-apt--keyring--mode"></a>`mode`
 
 Data type: `Stdlib::Filemode`

manifests/keyring.pp

@@ -20,9 +20,6 @@
 # @param filename
 #   Optional filename for the keyring. It should also contain extension along with the filename.
 #
-# @param file
-#   File path of the keyring.
-#
 # @param mode
 #   File permissions of the keyring.
 #
@@ -38,7 +35,6 @@
 define apt::keyring (
   Stdlib::Absolutepath $dir = '/etc/apt/keyrings',
   String[1] $filename = $name,
-  Stdlib::Absolutepath $file = "${dir}/${filename}",
   Stdlib::Filemode $mode = '0644',
   Optional[Stdlib::Filesource] $source = undef,
   Optional[String[1]] $content = undef,
@@ -51,6 +47,8 @@
     fail("One of 'source' or 'content' parameters are required")
   }
 
+  $file = "${dir}/${filename}"
+
   case $ensure {
     'present': {
       file { $file: