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.

5 files changed, 15 insertions, 24 deletions

diff --git a/lib/chef/knife/user_create.rb b/lib/chef/knife/user_create.rb
index 5332e863ae..e73f6be8b6 100644
--- a/lib/chef/knife/user_create.rb
+++ b/lib/chef/knife/user_create.rb
@@ -78,11 +78,13 @@ knife user create for Open Source 11 Server is being deprecated.
 Open Source 11 Server user commands now live under the knife osc_user namespace.
 For backwards compatibility, we will forward this request to knife osc_user create.
 If you are using an Open Source 11 Server, please use that command to avoid this warning.
-If you are not using an Open Source Chef 11 Server install, please read knife user create --help for proper usage.
 EOF
       end
 
       def run_osc_11_user_create
+        # run osc_user_create with our input
+        ARGV.delete("user")
+        ARGV.unshift("osc_user")
         Chef::Knife.run(ARGV, Chef::Application::Knife.options)
       end
 
@@ -93,12 +95,7 @@ EOF
         # If only 1 arg is passed, assume OSC 11 case.
         if @name_args.length == 1
           ui.warn(osc_11_warning)
-
-          # run osc_user_create with our input
-          ARGV.delete("user")
-          ARGV.unshift("osc_user")
           run_osc_11_user_create
-
         else # EC / CS 12 user create
 
           test_mandatory_field(@name_args[0], "username")
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
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
diff --git a/lib/chef/knife/user_reregister.rb b/lib/chef/knife/user_reregister.rb
index c2b39761cc..eab2245025 100644
--- a/lib/chef/knife/user_reregister.rb
+++ b/lib/chef/knife/user_reregister.rb
@@ -41,6 +41,9 @@ EOF
       end
 
       def run_osc_11_user_reregister
+        # run osc_user_edit with our input
+        ARGV.delete("user")
+        ARGV.unshift("osc_user")
         Chef::Knife.run(ARGV, Chef::Application::Knife.options)
       end
 
@@ -67,10 +70,6 @@ EOF
         # forward to deprecated command
         if user.username.nil?
           ui.warn(osc_11_warning)
-
-          # run osc_user_edit with our input
-          ARGV.delete("user")
-          ARGV.unshift("osc_user")
           run_osc_11_user_reregister
         else # EC / CS 12 case
           user.reregister
diff --git a/lib/chef/knife/user_show.rb b/lib/chef/knife/user_show.rb
index d0e9f64f53..f5e81e9972 100644
--- a/lib/chef/knife/user_show.rb
+++ b/lib/chef/knife/user_show.rb
@@ -43,6 +43,9 @@ EOF
       end
 
       def run_osc_11_user_show
+        # run osc_user_edit with our input
+        ARGV.delete("user")
+        ARGV.unshift("osc_user")
         Chef::Knife.run(ARGV, Chef::Application::Knife.options)
       end
 
@@ -64,10 +67,6 @@ EOF
         # forward to deprecated command
         if user.username.nil?
           ui.warn(osc_11_warning)
-
-          # run osc_user_edit with our input
-          ARGV.delete("user")
-          ARGV.unshift("osc_user")
           run_osc_11_user_show
         else
           output(format_for_display(user))