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_edit.rb b/lib/chef/knife/user_edit.rb
index 5bed51a1cc..dd2fc02743 100644
--- a/lib/chef/knife/user_edit.rb
+++ b/lib/chef/knife/user_edit.rb
@@ -41,6 +41,9 @@ EOF
       end
 
       def run_osc_11_user_edit
+        # run osc_user_create with our input
+        ARGV.delete("user")
+        ARGV.unshift("osc_user")
         Chef::Knife.run(ARGV, Chef::Application::Knife.options)
       end
 
@@ -62,12 +65,7 @@ EOF
         # forward to deprecated command
         if original_user["username"].nil?
           ui.warn(osc_11_warning)
-
-          # run osc_user_create with our input
-          ARGV.delete("user")
-          ARGV.unshift("osc_user")
           run_osc_11_user_edit
-
         else # EC / CS 12 user create
           edited_user = edit_data(original_user)
           if original_user != edited_user