Skip to content

Commit 0b027e5

Browse files
committed
(MAINT) Apply lint autofixes
Prior to this commit lint would not work properly in Github Actions. This commit aims to fix the problems that cause failure in CI.
1 parent 33802c9 commit 0b027e5

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

manifests/exec.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
$exec_provider = undef
4141
}
4242

43-
$docker_exec_flags = docker_exec_flags( {
43+
$docker_exec_flags = docker_exec_flags({
4444
detach => $detach,
4545
interactive => $interactive,
4646
tty => $tty,

manifests/plugin.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
}
5959

6060
if $ensure == 'present' {
61-
$docker_plugin_install_flags = docker_plugin_install_flags( {
61+
$docker_plugin_install_flags = docker_plugin_install_flags({
6262
plugin_name => $plugin_name,
6363
plugin_alias => $plugin_alias,
6464
disable_on_install => $disable_on_install,
@@ -79,7 +79,7 @@
7979
unless => $unless_install,
8080
}
8181
} elsif $ensure == 'absent' {
82-
$docker_plugin_remove_flags = docker_plugin_remove_flags( {
82+
$docker_plugin_remove_flags = docker_plugin_remove_flags({
8383
plugin_name => $plugin_name,
8484
force_remove => $force_remove,
8585
}
@@ -98,7 +98,7 @@
9898
}
9999

100100
if $enabled {
101-
$docker_plugin_enable_flags = docker_plugin_enable_flags( {
101+
$docker_plugin_enable_flags = docker_plugin_enable_flags({
102102
plugin_name => $plugin_name,
103103
plugin_alias => $plugin_alias,
104104
timeout => $timeout,

manifests/run.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
$depends_array = any2array($depends)
310310
$depend_services_array = any2array($depend_services)
311311

312-
$docker_run_flags = docker_run_flags( {
312+
$docker_run_flags = docker_run_flags({
313313
cpuset => any2array($cpuset),
314314
disable_network => $disable_network,
315315
dns => any2array($dns),

manifests/secrets.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$docker_command = "${docker::params::docker_command} secret"
2020

2121
if $ensure == 'present' {
22-
$docker_secrets_flags = docker_secrets_flags( {
22+
$docker_secrets_flags = docker_secrets_flags({
2323
ensure => $ensure,
2424
label => $label,
2525
secret_name => $secret_name,

manifests/services.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
}
113113

114114
if $create {
115-
$docker_service_create_flags = docker_service_flags( {
115+
$docker_service_create_flags = docker_service_flags({
116116
detach => $detach,
117117
env => any2array($env),
118118
service_name => $service_name,
@@ -133,7 +133,7 @@
133133
)
134134

135135
$exec_create = [$docker_command, 'create', '--name', $docker_service_create_flags]
136-
$unless_create = ['docker', 'service', 'ps', "${service_name}"]
136+
$unless_create = ['docker', 'service', 'ps', $service_name]
137137

138138
exec { "${title} docker service create":
139139
command => $exec_create,
@@ -146,7 +146,7 @@
146146
}
147147

148148
if $update {
149-
$docker_service_flags = docker_service_flags( {
149+
$docker_service_flags = docker_service_flags({
150150
detach => $detach,
151151
env => any2array($env),
152152
service_name => $service_name,
@@ -175,7 +175,7 @@
175175
}
176176

177177
if $scale {
178-
$docker_service_flags = docker_service_flags( {
178+
$docker_service_flags = docker_service_flags({
179179
service_name => $service_name,
180180
replicas => $replicas,
181181
extra_params => any2array($extra_params),

manifests/stack.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050

5151
if $ensure == 'present' {
52-
$docker_stack_flags = docker_stack_flags ( {
52+
$docker_stack_flags = docker_stack_flags ({
5353
stack_name => $stack_name,
5454
bundle_file => $bundle_file,
5555
compose_files => $compose_files,

manifests/swarm.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
$docker_command = "${docker::params::docker_command} swarm"
102102

103103
if $init {
104-
$docker_swarm_init_flags = docker_swarm_init_flags( {
104+
$docker_swarm_init_flags = docker_swarm_init_flags({
105105
init => $init,
106106
advertise_addr => $advertise_addr,
107107
autolock => $autolock,
@@ -130,7 +130,7 @@
130130
}
131131

132132
if $join {
133-
$docker_swarm_join_flags = docker_swarm_join_flags( {
133+
$docker_swarm_join_flags = docker_swarm_join_flags({
134134
join => $join,
135135
advertise_addr => $advertise_addr,
136136
listen_addr => $listen_addr,

spec/shared_examples/services.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
)
5858

5959
exec_create = [docker_command, 'create', '--name', docker_service_create_flags]
60-
unless_create = ['docker', 'service', 'ps', "#{service_name == :undef ? '' : service_name}"]
60+
unless_create = ['docker', 'service', 'ps', (service_name == :undef ? '' : service_name).to_s]
6161

6262
it {
6363
is_expected.to contain_exec("#{title} docker service create").with(

0 commit comments

Comments
 (0)