Better API version error handling helper code.

Renamed Chef::Mixin::ApiVersionRequestHandling.handle_version_http_exception -> server_client_api_version_intersection and made it do much more useful / sane things. See comments for details.

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/chef/knife/user_delete.rb b/lib/chef/knife/user_delete.rb
index 3a46e33f84..803be6b90c 100644
--- a/lib/chef/knife/user_delete.rb
+++ b/lib/chef/knife/user_delete.rb
@@ -41,6 +41,9 @@ EOF
       end
 
       def run_osc_11_user_delete
+        # run osc_user_delete with our input
+        ARGV.delete("user")
+        ARGV.unshift("osc_user")
         Chef::Knife.run(ARGV, Chef::Application::Knife.options)
       end
 
@@ -82,12 +85,7 @@ EOF
         # OSC 11 case
         if object.username.nil?
           ui.warn(osc_11_warning)
-
-          # run osc_user_delete with our input
-          ARGV.delete("user")
-          ARGV.unshift("osc_user")
           run_osc_11_user_delete
-
         else # proceed with EC / CS delete
           delete_object(@user_name)
         end