Upgrade to chef 17

diff --git a/.kitchen.yml b/.kitchen.yml
index 35e9ba62d0760869350ac7ec9a4a5e648f41e575..3b998f43ebc36aec40b2ec8bead3bada83ce9fd4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 16
+  chef_version: 17

   env:
     - container=dokken
 
   env:
     - container=dokken
 

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 2df477cdac7575d627d56aedfea77554c29e6820..12696d4088d6e922114795b4d866d150bf56f5a9 100644 (file)
--- 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][: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 f2008fc62d2f6a62aa40eb345eadc51ea505e437..9e94628b01061c18d7fdbb3070c13003334035ab 100644 (file)
--- a/cookbooks/chef/libraries/subversion.rb
+++ b/cookbooks/chef/libraries/subversion.rb
@@ -42,7 +42,7 @@ class Chef
 
       def svn_info
         command = scm(:info)
 
       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
       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}")
                             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
 
                             extract_revision_info(svn_info)
                           end