Optional[String] $options = undef,
) {
- 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'])
+ assert_type(
+ Pattern[
+ /\A(0x)?[0-9a-fA-F]{8}\Z/,
+ /\A(0x)?[0-9a-fA-F]{16}\Z/,
+ /\A(0x)?[0-9a-fA-F]{40}\Z/,
+ ], $id)
if $source {
- validate_re($source, ['\Ahttps?:\/\/', '\Aftp:\/\/', '\A\/\w+'])
+ assert_type(Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/], $source)
}
if $server {
- validate_re($server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$'])
+ assert_type(Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/], $server)
}
case $ensure {
present: {
if defined(Anchor["apt_key ${id} absent"]){
- fail("key with id ${id} already ensured as absent")
+ fail(translate('key with id %{_id} already ensured as absent'),{'_id' => id})
}
if !defined(Anchor["apt_key ${id} present"]) {
case $facts['os']['name'] {
'Debian': {
- if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
- Apt::Key<| title == $title |> {
- require => Package['dirmngr']
- }
+ if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+ ensure_packages(['dirmngr'])
+ Apt::Key<| title == $title |>
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
- Apt::Key<| title == $title |> {
- require => Package['dirmngr']
- }
+ ensure_packages(['dirmngr'])
+ Apt::Key<| title == $title |>
}
}
default: { }
absent: {
if defined(Anchor["apt_key ${id} present"]){
- fail("key with id ${id} already ensured as present")
+ fail(translate('key with id %{_id} already ensured as present', {'_id' => id}))
}
if !defined(Anchor["apt_key ${id} absent"]){
}
default: {
- fail "Invalid 'ensure' value '${ensure}' for apt::key"
+ fail translate('Invalid \'ensure\' value \'%{_ensure}\' for apt::key', {'_ensure' => ensure})
}
}
}