Skip to content

Commit b074ae1

Browse files
PierreRdavejrt
PierreR
authored and
davejrt
committed
More idiomatic usage of parens for 'fail translate((' (#327)
* More idiomatic usage of parens for 'fail translate((' * Change '((' to more idiomatic usage in install & service.pp
1 parent 30194fa commit b074ae1

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎manifests/init.pp

+16-16
Original file line numberDiff line numberDiff line change
@@ -490,67 +490,67 @@
490490

491491
if $::osfamily {
492492
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $::osfamily) |$a, $b| {
493-
fail translate(('This module only works on Debian, Red Hat or Windows based systems.'))
493+
fail(translate('This module only works on Debian, Red Hat or Windows based systems.'))
494494
}
495495
}
496496

497497
if ($::operatingsystem == 'CentOS') and (Integer($::operatingsystemmajrelease) < 7){
498-
fail translate(('This module only works on CentOS version 7 and higher based systems.'))
498+
fail(translate('This module only works on CentOS version 7 and higher based systems.'))
499499
}
500500

501501
if ($default_gateway) and (!$bridge) {
502-
fail translate(('You must provide the $bridge parameter.'))
502+
fail(translate('You must provide the $bridge parameter.'))
503503
}
504504

505505
if $log_level {
506506
assert_type(Pattern[/^(debug|info|warn|error|fatal)$/], $log_level) |$a, $b| {
507-
fail translate(('log_level must be one of debug, info, warn, error or fatal'))
507+
fail(translate('log_level must be one of debug, info, warn, error or fatal'))
508508
}
509509
}
510510

511511
if $log_driver {
512512
if $::osfamily == 'windows' {
513513
assert_type(Pattern[/^(none|json-file|syslog|gelf|fluentd|splunk|etwlogs)$/], $log_driver) |$a, $b| {
514-
fail translate(('log_driver must be one of none, json-file, syslog, gelf, fluentd, splunk or etwlogs'))
514+
fail(translate('log_driver must be one of none, json-file, syslog, gelf, fluentd, splunk or etwlogs'))
515515
}
516516
} else {
517517
assert_type(Pattern[/^(none|json-file|syslog|journald|gelf|fluentd|splunk)$/], $log_driver) |$a, $b| {
518-
fail translate(('log_driver must be one of none, json-file, syslog, journald, gelf, fluentd or splunk'))
518+
fail(translate('log_driver must be one of none, json-file, syslog, journald, gelf, fluentd or splunk'))
519519
}
520520
}
521521
}
522522

523523
if $storage_driver {
524524
if $::osfamily == 'windows' {
525525
assert_type(Pattern[/^(windowsfilter)$/], $storage_driver) |$a, $b| {
526-
fail translate(('Valid values for storage_driver on windows are windowsfilter'))
526+
fail(translate('Valid values for storage_driver on windows are windowsfilter'))
527527
}
528528
} else {
529529
assert_type(Pattern[/^(aufs|devicemapper|btrfs|overlay|overlay2|vfs|zfs)$/], $storage_driver) |$a, $b| {
530-
fail translate(('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
530+
fail(translate('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
531531
}
532532
}
533533
}
534534

535535
if ($bridge) and ($::osfamily == 'windows') {
536536
assert_type(Pattern[/^(none|nat|transparent|overlay|l2bridge|l2tunnel)$/], $bridge) |$a, $b| {
537-
fail translate(('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.'))
537+
fail(translate('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.'))
538538
}
539539
}
540540

541541
if $dm_fs {
542542
assert_type(Pattern[/^(ext4|xfs)$/], $dm_fs) |$a, $b| {
543-
fail translate(('Only ext4 and xfs are supported currently for dm_fs.'))
543+
fail(translate('Only ext4 and xfs are supported currently for dm_fs.'))
544544
}
545545
}
546546

547547
if ($dm_loopdatasize or $dm_loopmetadatasize) and ($dm_datadev or $dm_metadatadev) {
548-
fail translate(('You should provide parameters only for loop lvm or direct lvm, not both.'))
548+
fail(translate('You should provide parameters only for loop lvm or direct lvm, not both.'))
549549
}
550550

551551
# lint:ignore:140chars
552552
if ($dm_datadev or $dm_metadatadev) and $dm_thinpooldev {
553-
fail translate(('You can use the $dm_thinpooldev parameter, or the $dm_datadev and $dm_metadatadev parameter pair, but you cannot use both.'))
553+
fail(translate('You can use the $dm_thinpooldev parameter, or the $dm_datadev and $dm_metadatadev parameter pair, but you cannot use both.'))
554554
}
555555
# lint:endignore
556556

@@ -559,17 +559,17 @@
559559
}
560560

561561
if ($dm_datadev and !$dm_metadatadev) or (!$dm_datadev and $dm_metadatadev) {
562-
fail translate(('You need to provide both $dm_datadev and $dm_metadatadev parameters for direct lvm.'))
562+
fail(translate('You need to provide both $dm_datadev and $dm_metadatadev parameters for direct lvm.'))
563563
}
564564

565565
if ($dm_basesize or $dm_fs or $dm_mkfsarg or $dm_mountopt or $dm_blocksize or $dm_loopdatasize or
566566
$dm_loopmetadatasize or $dm_datadev or $dm_metadatadev) and ($storage_driver != 'devicemapper') {
567-
fail translate(('Values for dm_ variables will be ignored unless storage_driver is set to devicemapper.'))
567+
fail(translate('Values for dm_ variables will be ignored unless storage_driver is set to devicemapper.'))
568568
}
569569

570570
if($tls_enable) {
571571
if(!$tcp_bind) {
572-
fail translate(('You need to provide tcp bind parameter for TLS.'))
572+
fail(translate('You need to provide tcp bind parameter for TLS.'))
573573
}
574574
}
575575

@@ -598,7 +598,7 @@
598598
$package_key_check_source = true
599599
}
600600
'windows': {
601-
fail translate(('This module only work for Docker Enterprise Edition on Windows.'))
601+
fail(translate('This module only work for Docker Enterprise Edition on Windows.'))
602602
}
603603
default: {}
604604
}

‎manifests/install.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
$docker_start_command = $docker::docker_start_command
3131
if $::osfamily {
3232
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $::osfamily) |$a, $b| {
33-
fail translate(('This module only works on Debian, RedHat or Windows.'))
33+
fail(translate('This module only works on Debian, RedHat or Windows.'))
3434
}
3535
}
3636
if $docker::version and $docker::ensure != 'absent' {
@@ -55,7 +55,7 @@
5555
$pk_provider = 'yum'
5656
}
5757
'windows' : {
58-
fail translate('Custom package source is currently not implemented on windows.')
58+
fail(translate('Custom package source is currently not implemented on windows.'))
5959
}
6060
default : {
6161
$pk_provider = undef

‎manifests/service.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
) {
120120

121121
unless $::osfamily =~ /(Debian|RedHat|windows)/ {
122-
fail translate(('The docker::service class needs a Debian, Redhat or Windows based system.'))
122+
fail(translate('The docker::service class needs a Debian, Redhat or Windows based system.'))
123123
}
124124

125125
$dns_array = any2array($dns)

0 commit comments

Comments
 (0)