From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Sep 2021 18:27:29 +0000 (+0100)
Subject: Upgrade to chef 17
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/c6fcf3e7063047488218578e3b50ed4c91baf22e

Upgrade to chef 17
---

diff --git a/.kitchen.yml b/.kitchen.yml
index 35e9ba62d..3b998f43e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
-  chef_version: 16
+  chef_version: 17
   env:
     - container=dokken
 
diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 2df477cda..12696d408 100644
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,4 +5,4 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "12.17.33"
 
 # Set the default client version
-default[:chef][:client][:version] = "16.16.13"
+default[:chef][:client][:version] = "17.6.18"
diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb
index f2008fc62..9e94628b0 100644
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -42,7 +42,7 @@ class Chef
 
       def svn_info
         command = scm(:info)
-        shell_out!(command, run_options(:cwd => cwd, :returns => [0, 1])).stdout
+        shell_out!(command, **run_options(:cwd => cwd, :returns => [0, 1])).stdout
       end
 
       def revision_int
@@ -50,7 +50,7 @@ class Chef
                             new_resource.revision
                           else
                             command = scm(:info, new_resource.repository, new_resource.svn_info_args, authentication, "-r#{new_resource.revision}")
-                            svn_info = shell_out!(command, run_options(:returns => [0, 1])).stdout
+                            svn_info = shell_out!(command, **run_options(:returns => [0, 1])).stdout
 
                             extract_revision_info(svn_info)
                           end