Skip to content

Commit f0406f6

Browse files
daianamezdreadaianamezdrea
authored
Merge pull request #737 from david22swan/IAC-1497/main/translate_removal
(IAC-1497) - Removal of unsupported `translate` dependency
2 parents 1d7c600 + 5a5b7d7 commit f0406f6

File tree

10 files changed

+32
-37
lines changed

10 files changed

+32
-37
lines changed

Diff for: ‎.fixtures.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ fixtures:
22
forge_modules:
33
stdlib: 'puppetlabs-stdlib'
44
apt: 'puppetlabs-apt'
5-
translate: 'puppetlabs-translate'
65
powershell: 'puppetlabs-powershell'
76
reboot: 'puppetlabs-reboot'
87
repositories:

Diff for: ‎manifests/image.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,23 @@
6969
)
7070

7171
if ($docker_file) and ($docker_tar) {
72-
fail(translate('docker::image must not have both $docker_file and $docker_tar set'))
72+
fail('docker::image must not have both $docker_file and $docker_tar set')
7373
}
7474

7575
if ($docker_dir) and ($docker_tar) {
76-
fail(translate('docker::image must not have both $docker_dir and $docker_tar set'))
76+
fail('docker::image must not have both $docker_dir and $docker_tar set')
7777
}
7878

7979
if ($image_digest) and ($docker_file) {
80-
fail(translate('docker::image must not have both $image_digest and $docker_file set'))
80+
fail('docker::image must not have both $image_digest and $docker_file set')
8181
}
8282

8383
if ($image_digest) and ($docker_dir) {
84-
fail(translate('docker::image must not have both $image_digest and $docker_dir set'))
84+
fail('docker::image must not have both $image_digest and $docker_dir set')
8585
}
8686

8787
if ($image_digest) and ($docker_tar) {
88-
fail(translate('docker::image must not have both $image_digest and $docker_tar set'))
88+
fail('docker::image must not have both $image_digest and $docker_tar set')
8989
}
9090

9191
if $force {

Diff for: ‎manifests/init.pp

+16-16
Original file line numberDiff line numberDiff line change
@@ -481,83 +481,83 @@
481481
) inherits docker::params {
482482
if $facts['os']['family'] and ! $acknowledge_unsupported_os {
483483
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['os']['family']) |$a, $b| {
484-
fail(translate('This module only works on Debian, Red Hat or Windows based systems.'))
484+
fail('This module only works on Debian, Red Hat or Windows based systems.')
485485
}
486486
}
487487

488488
if ($facts['os']['family'] == 'RedHat') and (versioncmp($facts['os']['release']['major'], '7') < 0) {
489-
fail(translate('This module only works on Red Hat based systems version 7 and higher.'))
489+
fail('This module only works on Red Hat based systems version 7 and higher.')
490490
}
491491

492492
if ($default_gateway) and (!$bridge) {
493-
fail(translate('You must provide the $bridge parameter.'))
493+
fail('You must provide the $bridge parameter.')
494494
}
495495

496496
if $log_level {
497497
assert_type(Pattern[/^(debug|info|warn|error|fatal)$/], $log_level) |$a, $b| {
498-
fail(translate('log_level must be one of debug, info, warn, error or fatal'))
498+
fail('log_level must be one of debug, info, warn, error or fatal')
499499
}
500500
}
501501

502502
if $log_driver {
503503
if $facts['os']['family'] == 'windows' {
504504
assert_type(Pattern[/^(none|json-file|syslog|gelf|fluentd|splunk|awslogs|etwlogs)$/], $log_driver) |$a, $b| {
505-
fail(translate('log_driver must be one of none, json-file, syslog, gelf, fluentd, splunk, awslogs or etwlogs'))
505+
fail('log_driver must be one of none, json-file, syslog, gelf, fluentd, splunk, awslogs or etwlogs')
506506
}
507507
} else {
508508
assert_type(Pattern[/^(none|json-file|syslog|journald|gelf|fluentd|splunk|awslogs)$/], $log_driver) |$a, $b| {
509-
fail(translate('log_driver must be one of none, json-file, syslog, journald, gelf, fluentd, splunk or awslogs'))
509+
fail('log_driver must be one of none, json-file, syslog, journald, gelf, fluentd, splunk or awslogs')
510510
}
511511
}
512512
}
513513

514514
if $storage_driver {
515515
if $facts['os']['family'] == 'windows' {
516516
assert_type(Pattern[/^(windowsfilter)$/], $storage_driver) |$a, $b| {
517-
fail(translate('Valid values for storage_driver on windows are windowsfilter'))
517+
fail('Valid values for storage_driver on windows are windowsfilter')
518518
}
519519
} else {
520520
assert_type(Pattern[/^(aufs|devicemapper|btrfs|overlay|overlay2|vfs|zfs)$/], $storage_driver) |$a, $b| {
521-
fail(translate('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
521+
fail('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.')
522522
}
523523
}
524524
}
525525

526526
if ($bridge) and ($facts['os']['family'] == 'windows') {
527527
assert_type(Pattern[/^(none|nat|transparent|overlay|l2bridge|l2tunnel)$/], $bridge) |$a, $b| {
528-
fail(translate('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.'))
528+
fail('bridge must be one of none, nat, transparent, overlay, l2bridge or l2tunnel on Windows.')
529529
}
530530
}
531531

532532
if $dm_fs {
533533
assert_type(Pattern[/^(ext4|xfs)$/], $dm_fs) |$a, $b| {
534-
fail(translate('Only ext4 and xfs are supported currently for dm_fs.'))
534+
fail('Only ext4 and xfs are supported currently for dm_fs.')
535535
}
536536
}
537537

538538
if ($dm_loopdatasize or $dm_loopmetadatasize) and ($dm_datadev or $dm_metadatadev) {
539-
fail(translate('You should provide parameters only for loop lvm or direct lvm, not both.'))
539+
fail('You should provide parameters only for loop lvm or direct lvm, not both.')
540540
}
541541

542542
if ($dm_datadev or $dm_metadatadev) and $dm_thinpooldev {
543-
fail(translate('You can use the $dm_thinpooldev parameter, or the $dm_datadev and $dm_metadatadev parameter pair, but you cannot use both.')) # lint:ignore:140chars
543+
fail('You can use the $dm_thinpooldev parameter, or the $dm_datadev and $dm_metadatadev parameter pair, but you cannot use both.') # lint:ignore:140chars
544544
}
545545

546546
if ($dm_datadev or $dm_metadatadev) {
547547
notice('The $dm_datadev and $dm_metadatadev parameter pair are deprecated. The $dm_thinpooldev parameter should be used instead.')
548548
}
549549

550550
if ($dm_datadev and !$dm_metadatadev) or (!$dm_datadev and $dm_metadatadev) {
551-
fail(translate('You need to provide both $dm_datadev and $dm_metadatadev parameters for direct lvm.'))
551+
fail('You need to provide both $dm_datadev and $dm_metadatadev parameters for direct lvm.')
552552
}
553553

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

558558
if($tls_enable) {
559559
if(! $tcp_bind) {
560-
fail(translate('You need to provide tcp bind parameter for TLS.'))
560+
fail('You need to provide tcp bind parameter for TLS.')
561561
}
562562
}
563563

@@ -586,7 +586,7 @@
586586
$package_key_check_source = true
587587
}
588588
'windows': {
589-
fail(translate('This module only work for Docker Enterprise Edition on Windows.'))
589+
fail('This module only work for Docker Enterprise Edition on Windows.')
590590
}
591591
default: {
592592
$package_location = $docker_package_location

Diff for: ‎manifests/install.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
if $facts['os']['family'] and ! $docker::acknowledge_unsupported_os {
3232
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['os']['family']) |$a, $b| {
33-
fail(translate('This module only works on Debian, RedHat or Windows.'))
33+
fail('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('Custom package source is currently not implemented on windows.')
5959
}
6060
default : {
6161
$pk_provider = undef

Diff for: ‎manifests/plugin.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
$docker_command = "${docker::params::docker_command} plugin"
5555

5656
if ($facts['os']['family'] == 'windows') {
57-
fail(translate('Feature not implemented on windows.'))
57+
fail('Feature not implemented on windows.')
5858
}
5959

6060
if $ensure == 'present' {

Diff for: ‎manifests/run.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@
269269
}
270270

271271
if ($remove_volume_on_start and !$remove_container_on_start) {
272-
fail(translate("In order to remove the volume on start for ${title} you need to also remove the container"))
272+
fail("In order to remove the volume on start for ${title} you need to also remove the container")
273273
}
274274

275275
if ($remove_volume_on_stop and !$remove_container_on_stop) {
276-
fail(translate("In order to remove the volume on stop for ${title} you need to also remove the container"))
276+
fail("In order to remove the volume on stop for ${title} you need to also remove the container")
277277
}
278278

279279
if $use_name {
@@ -497,10 +497,10 @@
497497
}
498498
default: {
499499
if $facts['os']['family'] != 'windows' {
500-
fail(translate('Docker needs a Debian or RedHat based system.'))
500+
fail('Docker needs a Debian or RedHat based system.')
501501
}
502502
elsif $ensure == 'present' {
503-
fail(translate('Restart parameter is required for Windows'))
503+
fail('Restart parameter is required for Windows')
504504
}
505505

506506
$hasstatus = $::docker::params::service_hasstatus

Diff for: ‎manifests/service.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
$root_dir_flag = $docker::root_dir_flag,
263263
) {
264264
unless $facts['os']['family'] =~ /(Debian|RedHat|windows)/ or $::docker::acknowledge_unsupported_os {
265-
fail(translate('The docker::service class needs a Debian, Redhat or Windows based system.'))
265+
fail('The docker::service class needs a Debian, Redhat or Windows based system.')
266266
}
267267

268268
$dns_array = any2array($dns)

Diff for: ‎manifests/services.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@
9191

9292
if $ensure == 'absent' {
9393
if $update {
94-
fail(translate('When removing a service you can not update it.'))
94+
fail('When removing a service you can not update it.')
9595
}
9696

9797
if $scale {
98-
fail(translate('When removing a service you can not update it.'))
98+
fail('When removing a service you can not update it.')
9999
}
100100
}
101101

Diff for: ‎metadata.json

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
"name": "puppetlabs/apt",
1717
"version_requirement": ">= 4.4.1 < 9.0.0"
1818
},
19-
{
20-
"name": "puppetlabs/translate",
21-
"version_requirement": ">= 0.0.1 < 3.0.0"
22-
},
2319
{
2420
"name": "puppetlabs/powershell",
2521
"version_requirement": ">= 2.1.4 < 6.0.0"

Diff for: ‎spec/helper/get_values_init.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def get_values_init(_params, _facts)
2424
package_key_source = _params['docker_ce_key_source']
2525
package_key_check_source = true
2626
# when 'windows'
27-
# fail(translate('This module only work for Docker Enterprise Edition on Windows.'))
27+
# fail('This module only work for Docker Enterprise Edition on Windows.')
2828
else
2929
package_location = _params['docker_package_location']
3030
package_key_source = _params['docker_package_key_source']

0 commit comments

Comments
 (0)