fix observations

Author: Brian Flores

SoftLayer/CLI/user/apikey.py

@@ -38,17 +38,10 @@ def cli(env, identifier, add, remove, refresh):
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')
 
-    if add:
+    if remove or refresh:
+        mgr.remove_api_authentication_key(user_id)
+        click.secho('Successfully removed API authentication key', fg='green')
+
+    if add or refresh:
         api_authentication_key = mgr.add_api_authentication_key(user_id)
         click.secho(f'Successfully added. New API Authentication Key: {api_authentication_key}', fg='green')
-    else:
-        api_authentication_keys = mgr.get_api_authentication_keys(user_id)
-        if len(api_authentication_keys) == 0:
-            raise exceptions.CLIAbort('The user has not API authentication keys')
-
-        mgr.remove_api_authentication_key(api_authentication_keys[0]['id'])
-        if remove:
-            click.secho('Successfully removed API authentication key', fg='green')
-        else:
-            api_authentication_key = mgr.add_api_authentication_key(user_id)
-            click.secho(f'Successfully refreshed. New API Authentication Key: {api_authentication_key}', fg='green')

SoftLayer/managers/user.py

@@ -339,12 +339,18 @@ def get_api_authentication_keys(self, user_id):
         """
         return self.user_service.getApiAuthenticationKeys(id=user_id)
 
-    def remove_api_authentication_key(self, api_key_id):
-        """Calls SoftLayer_User_Customer::removeApiAuthenticationKey
+    def remove_api_authentication_key(self, user_id):
+        """Calls SoftLayer_User_Customer::getApiAuthenticationKeys and
 
-        :param int api_key_id: API key to remove
+        SoftLayer_User_Customer::removeApiAuthenticationKey
+
+        :param int user_id: User to remove API key
         """
-        return self.user_service.removeApiAuthenticationKey(api_key_id)
+        api_authentication_keys = self.get_api_authentication_keys(user_id)
+        if len(api_authentication_keys) == 0:
+            return True
+
+        return self.user_service.removeApiAuthenticationKey(api_authentication_keys[0]['id'])
 
     def vpn_manual(self, user_id, value):
         """Enable or disable the manual config of subnets.

tests/CLI/modules/user_tests.py

@@ -10,7 +10,6 @@
 
 from unittest import mock as mock
 
-from SoftLayer.fixtures import SoftLayer_User_Customer
 from SoftLayer import testing
 
 
@@ -407,13 +406,6 @@ def test_remove_api_authentication_key(self):
         result = self.run_command(['user', 'apikey', '123456', '--remove'])
         self.assert_no_fail(result)
 
-    def test_remove_api_authentication_key_does_not_exist(self):
-        mock = self.set_mock('SoftLayer_User_Customer', 'getApiAuthenticationKeys')
-        mock.return_value = SoftLayer_User_Customer.getEmptyApiAuthenticationKeys
-        result = self.run_command(['user', 'apikey', '123456', '--remove'])
-        self.assertEqual(2, result.exit_code)
-        self.assertIn('The user has not API authentication keys', result.exception.message)
-
     def test_refresh_api_authentication_key(self):
         result = self.run_command(['user', 'apikey', '123456', '--refresh'])
         self.assert_no_fail(result)