Merge branch 'master' into issue1921

Author: edsonarios

.gitignore

@@ -15,4 +15,3 @@ dist/*
 .cache
 .idea
 .pytest_cache/*
-slcli

README.rst

@@ -98,6 +98,7 @@ is equivalent to
 
   $ slcli -vvv --format=json vs list
 
+
 Getting Help
 ------------
 Bugs and feature requests about this library should have a `GitHub issue <https://github.com/softlayer/softlayer-python/issues>`_ opened about them. 
@@ -110,6 +111,12 @@ Examples
 
 A curated list of examples on how to use this library can be found at `SLDN <https://softlayer.github.io/python/>`_
 
+Development
+-----------
+To get started working with this project please read the `CONTRIBUTING <https://github.com/softlayer/softlayer-python/blob/master/CONTRIBUTING.md>`_ document.
+
+You can quickly test local changes by running the './slcli' file, which will load the local softlayer-python code instead of the system's softlayer-python codebase.
+
 Debugging
 ---------
 To get the exact API call that this library makes, you can do the following.

SoftLayer/CLI/cdn/purge.py

@@ -1,5 +1,6 @@
 """Purge cached files from all edge nodes."""
 # :license: MIT, see LICENSE for more details.
+import datetime
 
 import click
 
@@ -28,8 +29,9 @@ def cli(env, unique_id, path):
     table = formatting.Table(['Date', 'Path', 'Saved', 'Status'])
 
     for data in result:
+        date = datetime.datetime.fromtimestamp(int(data['date']))
         table.add_row([
-            data['date'],
+            date,
             data['path'],
             data['saved'],
             data['status']

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:

SoftLayer/managers/cdn.py

@@ -140,7 +140,7 @@ def purge_content(self, unique_id, path):
         :param str path: A string of url or path that should be purged.
         :returns: A Container_Network_CdnMarketplace_Configuration_Cache_Purge array object
         """
-
+        path = f"/{path}"
         return self.cdn_purge.createPurge(unique_id, path)
 
     def get_usage_metrics(self, unique_id, history=30, frequency="aggregate"):

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=[

slcli

@@ -0,0 +1,11 @@
+#!python
+# The above might need to be edited to your path to python3
+import re
+import sys
+
+from SoftLayer.CLI.core import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+   # print("arvs[0] = %s" % sys.argv[0])
+    sys.exit(main())

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))

tests/CLI/modules/sshkey_tests.py

@@ -118,7 +118,7 @@ def test_print_key(self):
                          {'id': 1234, 'label': 'label', 'notes': 'notes'})
 
     def test_print_key_file(self):
-        if(sys.platform.startswith("win")):
+        if (sys.platform.startswith("win")):
             self.skipTest("Test doesn't work in Windows")
         with tempfile.NamedTemporaryFile() as sshkey_file:
             service = self.client['Security_Ssh_Key']

tests/CLI/modules/vs/vs_create_tests.py

@@ -693,7 +693,7 @@ def test_create_vs_no_confirm(self, confirm_mock):
         self.assertEqual(result.exit_code, 2)
 
     def test_create_vs_export(self):
-        if(sys.platform.startswith("win")):
+        if (sys.platform.startswith("win")):
             self.skipTest("Test doesn't work in Windows")
         with tempfile.NamedTemporaryFile() as config_file:
             result = self.run_command(['vs', 'create', '--hostname', 'TEST', '--export', config_file.name,