Error fixing

LukasAud · LukasAud · commit dce80eb1343d · 2022-10-17T17:12:59.000+01:00
diff --git a/manifests/compose.pp b/manifests/compose.pp
@@ -89,10 +89,11 @@
         ensure_packages(['curl'])
       }
 
+      $compose_install = "curl -s -S -L ${proxy_opt} ${docker_compose_url} -o ${docker_compose_location_versioned}"
       exec { "Install Docker Compose ${version}":
         path    => '/usr/bin/',
         cwd     => '/tmp',
-        command => ['curl', '-s', '-S', '-L', $proxy_opt, $docker_compose_url, '-o', $docker_compose_location_versioned],
+        command => $compose_install,
         creates => $docker_compose_location_versioned,
         require => Package['curl'],
       }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -113,7 +113,7 @@
             }
           }
 
-          $fail_restart_command = ['SC.exe', 'failure', 'Docker', 'reset= 432000', 'actions= restart/30000/restart/60000/restart/60000']
+          $fail_restart_command = 'SC.exe failure Docker reset= 432000 actions= restart/30000/restart/60000/restart/60000'
           exec { 'service-restart-on-failure':
             command     => $fail_restart_command,
             refreshonly => true,
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -68,8 +68,8 @@
       }
     )
 
-    $exec_install   = [$docker_command, 'install', $docker_plugin_install_flags]
-    $unless_install = [$docker_command, 'ls', "--format='{{.PluginReference}}' | grep -w ${plugin_name}"]
+    $exec_install   = "${docker_command} install ${docker_plugin_install_flags}"
+    $unless_install = "${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin install ${plugin_name}":
       command     => $exec_install,
@@ -86,7 +86,7 @@
     )
 
     $exec_rm   = [$docker_command, 'rm', $docker_plugin_remove_flags]
-    $onlyif_rm = [$docker_command, 'ls', "--format='{{.PluginReference}}' | grep -w ${plugin_name}"]
+    $onlyif_rm = "${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin remove ${plugin_name}":
       command     => $exec_rm,
@@ -106,7 +106,7 @@
     )
 
     $exec_enable   = [$docker_command, 'enable', $docker_plugin_enable_flags]
-    $onlyif_enable = [$docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}"]
+    $onlyif_enable = "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin enable ${plugin_name}":
       command     => $exec_enable,
@@ -117,7 +117,7 @@
     }
   } elsif $enabled == false {
     $else_command = [$docker_command, 'disable', $plugin_name]
-    $else_unless = [$docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}"]
+    $else_unless = "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "disable ${plugin_name}":
       command     => $else_command,
diff --git a/manifests/run.pp b/manifests/run.pp
@@ -527,8 +527,8 @@
 
     if $ensure == 'absent' {
       if $facts['os']['family'] == 'windows' {
-        $absent_stop_command = [$docker_command, 'stop', "--time=${stop_wait_time}", $sanitised_title]
-        $absent_stop_onlyif = [$docker_command, 'inspect', $sanitised_title]
+        $absent_stop_command = "${docker_command} stop --time=${stop_wait_time} ${sanitised_title}"
+        $absent_stop_onlyif = "${docker_command} inspect ${sanitised_title}"
 
         exec { "stop container ${service_prefix}${sanitised_title}":
           command     => $absent_stop_command,
@@ -550,7 +550,7 @@
         }
       }
       $absent_remove_command = [$docker_command, 'rm', '-v', $sanitised_title]
-      $absent_remove_onlyif = [$docker_command, 'inspect', $sanitised_title]
+      $absent_remove_onlyif = "${docker_command} inspect ${sanitised_title}"
 
       exec { "remove container ${service_prefix}${sanitised_title}":
         command     => $absent_remove_command,
diff --git a/manifests/services.pp b/manifests/services.pp
@@ -133,7 +133,7 @@
     )
 
     $exec_create   = [$docker_command, 'create', '--name', $docker_service_create_flags]
-    $unless_create = ['docker', 'service', 'ps', $service_name]
+    $unless_create = "docker service ps ${service_name}"
 
     exec { "${title} docker service create":
       command     => $exec_create,
diff --git a/spec/shared_examples/compose.rb b/spec/shared_examples/compose.rb
@@ -62,7 +62,7 @@
         is_expected.to contain_exec("Install Docker Compose #{version}").with(
           'path'    => '/usr/bin/',
           'cwd'     => '/tmp',
-          'command' => ['curl', '-s', '-S', '-L', proxy_opt, docker_compose_url, '-o', docker_compose_location_versioned],
+          'command' => "curl -s -S -L #{proxy_opt} #{docker_compose_url} -o #{docker_compose_location_versioned}",
           'creates' => docker_compose_location_versioned,
         ).that_requires(
           'Package[curl]',
diff --git a/spec/shared_examples/install.rb b/spec/shared_examples/install.rb
@@ -141,7 +141,7 @@
 
       it {
         is_expected.to contain_exec('service-restart-on-failure').with(
-          'command'     => ['SC.exe', 'failure', 'Docker', 'reset= 432000', 'actions= restart/30000/restart/60000/restart/60000'],
+          'command'     => 'SC.exe failure Docker reset= 432000 actions= restart/30000/restart/60000/restart/60000',
           'refreshonly' => true,
           'logoutput'   => true,
           'provider'    => 'powershell',
diff --git a/spec/shared_examples/plugin.rb b/spec/shared_examples/plugin.rb
@@ -24,8 +24,8 @@
       'settings'              => settings,
     )
 
-    exec_install   = [docker_command, 'install', docker_plugin_install_flags]
-    unless_install = [docker_command, 'ls', "--format='{{.PluginReference}}' | grep -w #{plugin_name}"]
+    exec_install   = "#{docker_command} install #{docker_plugin_install_flags}"
+    unless_install = "#{docker_command} ls --format='{{.PluginReference}}' | grep -w #{plugin_name}"
 
     it {
       is_expected.to contain_exec("plugin install #{plugin_name}").with(
@@ -44,7 +44,7 @@
     )
 
     exec_rm   = [docker_command, 'rm', docker_plugin_remove_flags]
-    onlyif_rm = [docker_command, 'ls', "--format='{{.PluginReference}}' | grep -w #{plugin_name}"]
+    onlyif_rm = "#{docker_command} ls --format='{{.PluginReference}}' | grep -w #{plugin_name}"
 
     it {
       is_expected.to contain_exec("plugin remove #{plugin_name}").with(
@@ -65,7 +65,7 @@
     )
 
     exec_enable   = [docker_command, 'enable', docker_plugin_enable_flags]
-    onlyif_enable = [docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' | grep -w #{plugin_name}"]
+    onlyif_enable = "#{docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w #{plugin_name}"
 
     it {
       is_expected.to contain_exec("plugin enable #{plugin_name}").with(
@@ -78,7 +78,7 @@
     }
   else
     else_command = [docker_command, 'disable', plugin_name]
-    else_unless = [docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' | grep -w #{plugin_name}"]
+    else_unless = "#{docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w #{plugin_name}"
 
     it {
       is_expected.to contain_exec("disable #{plugin_name}").with(
diff --git a/spec/shared_examples/services.rb b/spec/shared_examples/services.rb
@@ -57,7 +57,7 @@
     )
 
     exec_create   = [docker_command, 'create', '--name', docker_service_create_flags]
-    unless_create = ['docker', 'service', 'ps', (service_name == :undef ? '' : service_name).to_s]
+    unless_create = "docker service ps #{service_name == :undef ? '' : service_name}"
 
     it {
       is_expected.to contain_exec("#{title} docker service create").with(

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,11 @@`
`89`	`89`	`ensure_packages(['curl'])`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ $compose_install = "curl -s -S -L ${proxy_opt} ${docker_compose_url} -o ${docker_compose_location_versioned}"`
`92`	`93`	`exec { "Install Docker Compose ${version}":`
`93`	`94`	`path => '/usr/bin/',`
`94`	`95`	`cwd => '/tmp',`
`95`		`- command => ['curl', '-s', '-S', '-L', $proxy_opt, $docker_compose_url, '-o', $docker_compose_location_versioned],`
	`96`	`+ command => $compose_install,`
`96`	`97`	`creates => $docker_compose_location_versioned,`
`97`	`98`	`require => Package['curl'],`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- $fail_restart_command = ['SC.exe', 'failure', 'Docker', 'reset= 432000', 'actions= restart/30000/restart/60000/restart/60000']`
	`116`	`+ $fail_restart_command = 'SC.exe failure Docker reset= 432000 actions= restart/30000/restart/60000/restart/60000'`
`117`	`117`	`exec { 'service-restart-on-failure':`
`118`	`118`	`command => $fail_restart_command,`
`119`	`119`	`refreshonly => true,`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@`
`68`	`68`	`}`
`69`	`69`	`)`
`70`	`70`
`71`		`- $exec_install = [$docker_command, 'install', $docker_plugin_install_flags]`
`72`		`- $unless_install = [$docker_command, 'ls', "--format='{{.PluginReference}}' \| grep -w ${plugin_name}"]`
	`71`	`+ $exec_install = "${docker_command} install ${docker_plugin_install_flags}"`
	`72`	`+ $unless_install = "${docker_command} ls --format='{{.PluginReference}}' \| grep -w ${plugin_name}"`
`73`	`73`
`74`	`74`	`exec { "plugin install ${plugin_name}":`
`75`	`75`	`command => $exec_install,`
`@@ -86,7 +86,7 @@`
`86`	`86`	`)`
`87`	`87`
`88`	`88`	`$exec_rm = [$docker_command, 'rm', $docker_plugin_remove_flags]`
`89`		`- $onlyif_rm = [$docker_command, 'ls', "--format='{{.PluginReference}}' \| grep -w ${plugin_name}"]`
	`89`	`+ $onlyif_rm = "${docker_command} ls --format='{{.PluginReference}}' \| grep -w ${plugin_name}"`
`90`	`90`
`91`	`91`	`exec { "plugin remove ${plugin_name}":`
`92`	`92`	`command => $exec_rm,`
`@@ -106,7 +106,7 @@`
`106`	`106`	`)`
`107`	`107`
`108`	`108`	`$exec_enable = [$docker_command, 'enable', $docker_plugin_enable_flags]`
`109`		`- $onlyif_enable = [$docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' \| grep -w ${plugin_name}"]`
	`109`	`+ $onlyif_enable = "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' \| grep -w ${plugin_name}"`
`110`	`110`
`111`	`111`	`exec { "plugin enable ${plugin_name}":`
`112`	`112`	`command => $exec_enable,`
`@@ -117,7 +117,7 @@`
`117`	`117`	`}`
`118`	`118`	`} elsif $enabled == false {`
`119`	`119`	`$else_command = [$docker_command, 'disable', $plugin_name]`
`120`		`- $else_unless = [$docker_command, 'ls', '-f', "enabled=false --format='{{.PluginReference}}' \| grep -w ${plugin_name}"]`
	`120`	`+ $else_unless = "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' \| grep -w ${plugin_name}"`
`121`	`121`
`122`	`122`	`exec { "disable ${plugin_name}":`
`123`	`123`	`command => $else_command,`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@`
`133`	`133`	`)`
`134`	`134`
`135`	`135`	`$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}"`
`137`	`137`
`138`	`138`	`exec { "${title} docker service create":`
`139`	`139`	`command => $exec_create,`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`)`
`58`	`58`
`59`	`59`	`exec_create = [docker_command, 'create', '--name', docker_service_create_flags]`
`60`		`- unless_create = ['docker', 'service', 'ps', (service_name == :undef ? '' : service_name).to_s]`
	`60`	`+ unless_create = "docker service ps #{service_name == :undef ? '' : service_name}"`
`61`	`61`
`62`	`62`	`it {`
`63`	`63`	`is_expected.to contain_exec("#{title} docker service create").with(`