Skip to content

Commit 2f55783

Browse files
crazymind1337crazymind1337
committed
general lint/indent of code
1 parent 1560b10 commit 2f55783

19 files changed

+430
-396
lines changed

‎manifests/compose.pp

+13-15
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,22 @@
5151
Optional[String] $raw_url = undef,
5252
Optional[Boolean] $curl_ensure = $docker::params::curl_ensure,
5353
) inherits docker::params {
54-
5554
if $proxy != undef {
5655
validate_re($proxy, '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$')
5756
}
5857

5958
if $::osfamily == 'windows' {
6059
$file_extension = '.exe'
61-
$file_owner = 'Administrator'
60+
$file_owner = 'Administrator'
6261
} else {
6362
$file_extension = ''
64-
$file_owner = 'root'
63+
$file_owner = 'root'
6564
}
6665

67-
$docker_compose_location = "${install_path}/${symlink_name}${file_extension}"
66+
$docker_compose_location = "${install_path}/${symlink_name}${file_extension}"
6867
$docker_compose_location_versioned = "${install_path}/docker-compose-${version}${file_extension}"
6968

7069
if $ensure == 'present' {
71-
7270
if $raw_url != undef {
7371
$docker_compose_url = $raw_url
7472
} else {
@@ -82,9 +80,7 @@
8280
}
8381

8482
if $::osfamily == 'windows' {
85-
# lint:ignore:140chars
86-
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}"
87-
# lint:endignore
83+
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}" # lint:ignore:140chars
8884

8985
exec { "Install Docker Compose ${version}":
9086
command => template('docker/windows/download_docker_compose.ps1.erb'),
@@ -95,12 +91,13 @@
9591
file { $docker_compose_location:
9692
ensure => 'link',
9793
target => $docker_compose_location_versioned,
98-
require => Exec["Install Docker Compose ${version}"]
94+
require => Exec["Install Docker Compose ${version}"],
9995
}
10096
} else {
10197
if $curl_ensure {
10298
ensure_packages(['curl'])
10399
}
100+
104101
exec { "Install Docker Compose ${version}":
105102
path => '/usr/bin/',
106103
cwd => '/tmp',
@@ -112,20 +109,21 @@
112109
file { $docker_compose_location_versioned:
113110
owner => $file_owner,
114111
mode => '0755',
115-
require => Exec["Install Docker Compose ${version}"]
112+
require => Exec["Install Docker Compose ${version}"],
116113
}
117114

118115
file { $docker_compose_location:
119116
ensure => 'link',
120117
target => $docker_compose_location_versioned,
121-
require => File[$docker_compose_location_versioned]
118+
require => File[$docker_compose_location_versioned],
122119
}
123120
}
124121
} else {
125-
file { [
126-
$docker_compose_location_versioned,
127-
$docker_compose_location
128-
]:
122+
file { $docker_compose_location_versioned:
123+
ensure => absent,
124+
}
125+
126+
file { $docker_compose_location:
129127
ensure => absent,
130128
}
131129
}

‎manifests/exec.pp

+17-12
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,40 @@
2020

2121
if $::osfamily == 'windows' {
2222
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
23-
$exec_timeout = 3000
24-
$exec_path = ["${::docker_program_files_path}/Docker/"]
25-
$exec_provider = 'powershell'
23+
$exec_timeout = 3000
24+
$exec_path = [ "${::docker_program_files_path}/Docker/", ]
25+
$exec_provider = 'powershell'
2626
} else {
2727
$exec_environment = 'HOME=/root'
28-
$exec_path = ['/bin', '/usr/bin']
29-
$exec_timeout = 0
30-
$exec_provider = undef
28+
$exec_path = ['/bin', '/usr/bin', ]
29+
$exec_timeout = 0
30+
$exec_provider = undef
3131
}
3232

33-
$docker_exec_flags = docker_exec_flags({
34-
detach => $detach,
35-
interactive => $interactive,
36-
tty => $tty,
37-
env => any2array($env),
38-
})
33+
$docker_exec_flags = docker_exec_flags(
34+
{
35+
detach => $detach,
36+
interactive => $interactive,
37+
tty => $tty,
38+
env => any2array($env),
39+
}
40+
)
3941

4042

4143
if $sanitise_name {
4244
$sanitised_container = regsubst($container, '[^0-9A-Za-z.\-_]', '-', 'G')
4345
} else {
4446
$sanitised_container = $container
4547
}
48+
4649
$exec = "${docker_command} exec ${docker_exec_flags} ${sanitised_container} ${command}"
50+
4751
$unless_command = $unless ? {
4852
undef => undef,
4953
'' => undef,
5054
default => "${docker_command} exec ${docker_exec_flags} ${sanitised_container} ${$unless}",
5155
}
56+
5257
$onlyif_command = $onlyif ? {
5358
undef => undef,
5459
'' => undef,

‎manifests/image.pp

+22-21
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,25 @@
3434
Optional[String] $docker_tar = undef,
3535
) {
3636
include docker::params
37+
3738
$docker_command = $docker::params::docker_command
3839

3940
if $::osfamily == 'windows' {
4041
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
41-
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
42-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
43-
$exec_timeout = 3000
44-
$update_docker_image_owner = undef
45-
$exec_path = ["${::docker_program_files_path}/Docker/"]
46-
$exec_provider = 'powershell'
42+
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
43+
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
44+
$exec_timeout = 3000
45+
$update_docker_image_owner = undef
46+
$exec_path = [ "${::docker_program_files_path}/Docker/", ]
47+
$exec_provider = 'powershell'
4748
} else {
4849
$update_docker_image_template = 'docker/update_docker_image.sh.erb'
49-
$update_docker_image_path = '/usr/local/bin/update_docker_image.sh'
50-
$update_docker_image_owner = 'root'
51-
$exec_environment = 'HOME=/root'
52-
$exec_path = ['/bin', '/usr/bin']
53-
$exec_timeout = 0
54-
$exec_provider = undef
50+
$update_docker_image_path = '/usr/local/bin/update_docker_image.sh'
51+
$update_docker_image_owner = 'root'
52+
$exec_environment = 'HOME=/root'
53+
$exec_path = [ '/bin', '/usr/bin', ]
54+
$exec_timeout = 0
55+
$exec_provider = undef
5556
}
5657

5758
# Wrapper used to ensure images are up to date
@@ -66,29 +67,29 @@
6667
)
6768

6869
if ($docker_file) and ($docker_tar) {
69-
fail translate('docker::image must not have both $docker_file and $docker_tar set')
70+
fail(translate('docker::image must not have both $docker_file and $docker_tar set'))
7071
}
7172

7273
if ($docker_dir) and ($docker_tar) {
73-
fail translate('docker::image must not have both $docker_dir and $docker_tar set')
74+
fail(translate('docker::image must not have both $docker_dir and $docker_tar set'))
7475
}
7576

7677
if ($image_digest) and ($docker_file) {
77-
fail translate('docker::image must not have both $image_digest and $docker_file set')
78+
fail(translate('docker::image must not have both $image_digest and $docker_file set'))
7879
}
7980

8081
if ($image_digest) and ($docker_dir) {
81-
fail translate('docker::image must not have both $image_digest and $docker_dir set')
82+
fail(translate('docker::image must not have both $image_digest and $docker_dir set'))
8283
}
8384

8485
if ($image_digest) and ($docker_tar) {
85-
fail translate('docker::image must not have both $image_digest and $docker_tar set')
86+
fail(translate('docker::image must not have both $image_digest and $docker_tar set'))
8687
}
8788

8889
if $force {
89-
$image_force = '-f '
90+
$image_force = '-f '
9091
} else {
91-
$image_force = ''
92+
$image_force = ''
9293
}
9394

9495
if $image_tag {
@@ -99,12 +100,12 @@
99100
$image_arg = "${image}@${image_digest}"
100101
$image_remove = "${docker_command} rmi ${image_force}${image}:${image_digest}"
101102
$image_find = "${docker_command} images -q ${image}@${image_digest}"
102-
103103
} else {
104104
$image_arg = $image
105105
$image_remove = "${docker_command} rmi ${image_force}${image}"
106106
$image_find = "${docker_command} images -q ${image}"
107107
}
108+
108109
if $::osfamily == 'windows' {
109110
$_image_find = "If (-not (${image_find}) ) { Exit 1 }"
110111
} else {
@@ -142,7 +143,7 @@
142143
}
143144
} elsif $ensure == 'latest' or $image_tag == 'latest' {
144145
notify { "Check if image ${image_arg} is in-sync":
145-
noop => false,
146+
noop => false,
146147
}
147148
~> exec { $image_install:
148149
environment => $exec_environment,

‎manifests/init.pp

+37-41
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,6 @@
508508
Optional[String] $docker_msft_provider_version = $docker::params::docker_msft_provider_version,
509509
Optional[String] $nuget_package_provider_version = $docker::params::nuget_package_provider_version,
510510
) inherits docker::params {
511-
512-
513511
if $facts['osfamily'] and !$acknowledge_unsupported_os {
514512
assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['osfamily']) |$a, $b| {
515513
fail(translate('This module only works on Debian, Red Hat or Windows based systems.'))
@@ -570,11 +568,9 @@
570568
fail(translate('You should provide parameters only for loop lvm or direct lvm, not both.'))
571569
}
572570

573-
# lint:ignore:140chars
574571
if ($dm_datadev or $dm_metadatadev) and $dm_thinpooldev {
575-
fail(translate('You can use the $dm_thinpooldev parameter, or the $dm_datadev and $dm_metadatadev parameter pair, but you cannot use both.'))
572+
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
576573
}
577-
# lint:endignore
578574

579575
if ($dm_datadev or $dm_metadatadev) {
580576
notice('The $dm_datadev and $dm_metadatadev parameter pair are deprecated. The $dm_thinpooldev parameter should be used instead.')
@@ -584,90 +580,90 @@
584580
fail(translate('You need to provide both $dm_datadev and $dm_metadatadev parameters for direct lvm.'))
585581
}
586582

587-
if ($dm_basesize or $dm_fs or $dm_mkfsarg or $dm_mountopt or $dm_blocksize or $dm_loopdatasize or
588-
$dm_loopmetadatasize or $dm_datadev or $dm_metadatadev) and ($storage_driver != 'devicemapper') {
583+
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') {
589584
fail(translate('Values for dm_ variables will be ignored unless storage_driver is set to devicemapper.'))
590585
}
591586

592587
if($tls_enable) {
593-
if(!$tcp_bind) {
588+
if(! $tcp_bind) {
594589
fail(translate('You need to provide tcp bind parameter for TLS.'))
595590
}
596591
}
597592

598-
if ( $version == undef ) or ( $version !~ /^(17[.][0-1][0-9][.][0-1](~|-|\.)ce|1.\d+)/ ) {
599-
if ( $docker_ee) {
600-
$package_location = $docker::docker_ee_source_location
601-
$package_key_source = $docker::docker_ee_key_source
593+
if ($version == undef) or ($version !~ /^(17[.][0-1][0-9][.][0-1](~|-|\.)ce|1.\d+)/) {
594+
if ($docker_ee) {
595+
$package_location = $docker::docker_ee_source_location
596+
$package_key_source = $docker::docker_ee_key_source
602597
$package_key_check_source = true
603-
$package_key = $docker::docker_ee_key_id
604-
$package_repos = $docker::docker_ee_repos
605-
$release = $docker::docker_ee_release
606-
$docker_start_command = $docker::docker_ee_start_command
607-
$docker_package_name = $docker::docker_ee_package_name
598+
$package_key = $docker::docker_ee_key_id
599+
$package_repos = $docker::docker_ee_repos
600+
$release = $docker::docker_ee_release
601+
$docker_start_command = $docker::docker_ee_start_command
602+
$docker_package_name = $docker::docker_ee_package_name
608603
} else {
609604
case $facts['osfamily'] {
610605
'Debian' : {
611-
$package_location = $docker_ce_source_location
606+
$package_location = $docker_ce_source_location
612607
$package_key_source = $docker_ce_key_source
613-
$package_key = $docker_ce_key_id
614-
$package_repos = $docker_ce_channel
615-
$release = $docker_ce_release
608+
$package_key = $docker_ce_key_id
609+
$package_repos = $docker_ce_channel
610+
$release = $docker_ce_release
616611
}
617612
'Redhat' : {
618-
$package_location = $docker_ce_source_location
619-
$package_key_source = $docker_ce_key_source
613+
$package_location = $docker_ce_source_location
614+
$package_key_source = $docker_ce_key_source
620615
$package_key_check_source = true
621616
}
622617
'windows': {
623618
fail(translate('This module only work for Docker Enterprise Edition on Windows.'))
624619
}
625620
default: {
626-
$package_location = $docker_package_location
627-
$package_key_source = $docker_package_key_source
621+
$package_location = $docker_package_location
622+
$package_key_source = $docker_package_key_source
628623
$package_key_check_source = $docker_package_key_check_source
629624
}
630625
}
626+
631627
$docker_start_command = $docker_ce_start_command
632-
$docker_package_name = $docker_ce_package_name
628+
$docker_package_name = $docker_ce_package_name
633629
}
634630
} else {
635631
case $facts['osfamily'] {
636632
'Debian' : {
637-
$package_location = $docker_package_location
638-
$package_key_source = $docker_package_key_source
633+
$package_location = $docker_package_location
634+
$package_key_source = $docker_package_key_source
639635
$package_key_check_source = $docker_package_key_check_source
640-
$package_key = $docker_package_key_id
641-
$package_repos = 'main'
642-
$release = $docker_package_release
636+
$package_key = $docker_package_key_id
637+
$package_repos = 'main'
638+
$release = $docker_package_release
643639
}
644640
'Redhat' : {
645-
$package_location = $docker_package_location
646-
$package_key_source = $docker_package_key_source
641+
$package_location = $docker_package_location
642+
$package_key_source = $docker_package_key_source
647643
$package_key_check_source = $docker_package_key_check_source
648644
}
649645
default : {
650-
$package_location = $docker_package_location
651-
$package_key_source = $docker_package_key_source
646+
$package_location = $docker_package_location
647+
$package_key_source = $docker_package_key_source
652648
$package_key_check_source = $docker_package_key_check_source
653649
}
654650
}
655651
$docker_start_command = $docker_engine_start_command
656-
$docker_package_name = $docker_engine_package_name
652+
$docker_package_name = $docker_engine_package_name
657653
}
658654

659-
if ( $version != undef ) and ( $version =~ /^(17[.]0[0-4]|1.\d+)/ ) {
655+
if ($version != undef) and ($version =~ /^(17[.]0[0-4]|1.\d+)/) {
660656
$root_dir_flag = '-g'
661657
} else {
662658
$root_dir_flag = '--data-root'
663659
}
664660

665661

666662
if $ensure != 'absent' {
667-
contain 'docker::repos'
668-
contain 'docker::install'
669-
contain 'docker::config'
670-
contain 'docker::service'
663+
contain docker::repos
664+
contain docker::install
665+
contain docker::config
666+
contain docker::service
671667

672668
create_resources(
673669
'docker::registry',

0 commit comments

Comments
 (0)