Merge branch 'master' into issue1916

Author: edsonarios

SoftLayer/CLI/event_log/get.py

@@ -5,7 +5,7 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
+from SoftLayer import exceptions
 from SoftLayer import utils
 
 
@@ -40,6 +40,7 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
     request_filter = event_mgr.build_filter(date_min, date_max, obj_event, obj_id, obj_type, utc_offset)
     logs = event_mgr.get_event_logs(request_filter)
     log_time = "%Y-%m-%dT%H:%M:%S.%f%z"
+    # A list of IDs that we have looked up user information about.
     user_data = {}
 
     if metadata:
@@ -59,9 +60,11 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
             if username is None:
                 try:
                     username = user_mgr.get_user(log['userId'], "mask[username]")['username']
-                    user_data[log['userId']] = username
+                # Some users might not be able to access information about this specific userId
                 except exceptions.SoftLayerAPIError:
                     username = log['userId']
+            # This keeps track of any users we asked the API about, so we can make fewer calls.
+            user_data[log['userId']] = username
             user = username
 
         if metadata:

setup.py

@@ -40,7 +40,7 @@
         'prompt_toolkit >= 2',
         'pygments >= 2.0.0',
         'urllib3 >= 1.24',
-        'rich == 13.3.3'
+        'rich == 13.3.4'
     ],
     keywords=['softlayer', 'cloud', 'slcli'],
     classifiers=[

tests/CLI/modules/event_log_tests.py

@@ -6,6 +6,7 @@
 
 import json
 
+from SoftLayer import SoftLayerAPIError
 from SoftLayer import testing
 
 
@@ -91,3 +92,16 @@ def test_get_unlimited_events(self):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Event_Log', 'getAllObjects')
         self.assertEqual(8, result.output.count("\n"))
+
+    def test_issues1905(self):
+        """https://github.com/softlayer/softlayer-python/issues/1905"""
+        getUser = self.set_mock('SoftLayer_User_Customer', 'getObject')
+        getUser.side_effect = SoftLayerAPIError(
+            "SoftLayer_Exception_PermissionDenied",
+            "You do not have permission to access this user")
+        result = self.run_command(['event-log', 'get', '-l -1'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Event_Log', 'getAllObjects')
+        self.assert_called_with('SoftLayer_User_Customer', 'getObject', identifier=400)
+        user_calls = self.calls('SoftLayer_User_Customer', 'getObject')
+        self.assertEqual(1, len(user_calls))

tools/requirements.txt

@@ -4,6 +4,6 @@ requests >= 2.20.0
 prompt_toolkit >= 2
 pygments >= 2.0.0
 urllib3 >= 1.24
-rich == 13.3.3
+rich == 13.3.4
 # only used for soap transport
 # softlayer-zeep >= 5.0.0