From 2804baafe864486e52eb6ca758d65de20f784098 Mon Sep 17 00:00:00 2001 From: Michael Wurtz Date: Tue, 30 Oct 2018 15:41:03 -0500 Subject: [PATCH 1/2] Fixed doc formatting and some comments --- SoftLayer/CLI/image/export.py | 2 +- SoftLayer/CLI/image/import.py | 2 +- SoftLayer/managers/image.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SoftLayer/CLI/image/export.py b/SoftLayer/CLI/image/export.py index 375de7842..eb9081ac7 100644 --- a/SoftLayer/CLI/image/export.py +++ b/SoftLayer/CLI/image/export.py @@ -24,7 +24,7 @@ def cli(env, identifier, uri, ibm_api_key): The URI for an object storage object (.vhd/.iso file) of the format: swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage """ diff --git a/SoftLayer/CLI/image/import.py b/SoftLayer/CLI/image/import.py index 525564416..7f1b1e83e 100644 --- a/SoftLayer/CLI/image/import.py +++ b/SoftLayer/CLI/image/import.py @@ -52,7 +52,7 @@ def cli(env, name, note, os_code, uri, ibm_api_key, root_key_id, wrapped_dek, The URI for an object storage object (.vhd/.iso file) of the format: swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage """ diff --git a/SoftLayer/managers/image.py b/SoftLayer/managers/image.py index abd60ba8a..35f7c60c5 100644 --- a/SoftLayer/managers/image.py +++ b/SoftLayer/managers/image.py @@ -131,15 +131,15 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None, (.vhd/.iso file) of the format: swift://@// or (.vhd/.iso/.raw file) of the format: - cos://// if using IBM Cloud + cos://// if using IBM Cloud Object Storage :param string os_code: The reference code of the operating system :param string note: Note to add to the image :param string ibm_api_key: Ibm Api Key needed to communicate with ICOS - and Key Protect + and Key Protect :param string root_key_id: ID of the root key in Key Protect :param string wrapped_dek: Wrapped Data Encryption Key provided by - IBM KeyProtect + IBM KeyProtect :param string kp_id: ID of the IBM Key Protect Instance :param boolean cloud_init: Specifies if image is cloud-init :param boolean byol: Specifies if image is bring your own license @@ -173,10 +173,10 @@ def export_image_to_uri(self, image_id, uri, ibm_api_key=None): :param int image_id: The ID of the image :param string uri: The URI for object storage of the format swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage :param string ibm_api_key: Ibm Api Key needed to communicate with IBM - Cloud Object Storage + Cloud Object Storage """ if 'cos://' in uri: return self.vgbdtg.copyToIcos({ From 5fb8fb016eab1eee54641e027c3cecc3daf27aa2 Mon Sep 17 00:00:00 2001 From: Christopher Gallo Date: Tue, 30 Oct 2018 16:53:46 -0500 Subject: [PATCH 2/2] updating requests and urllib3 to address CVE-2018-18074 --- setup.py | 8 ++++---- tools/requirements.txt | 11 ++++++----- tools/test-requirements.txt | 9 +++++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index b4c86c2f5..c860c85be 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setup( name='SoftLayer', - version='5.6.0', + version='5.6.1', description=DESCRIPTION, long_description=LONG_DESCRIPTION, author='SoftLayer Technologies, Inc.', @@ -33,12 +33,12 @@ 'six >= 1.7.0', 'ptable >= 0.9.2', 'click >= 7', - 'requests == 2.19.1', + 'requests >= 2.20.0', 'prompt_toolkit >= 0.53', 'pygments >= 2.0.0', - 'urllib3 == 1.22' + 'urllib3 >= 1.24' ], - keywords=['softlayer', 'cloud'], + keywords=['softlayer', 'cloud', 'slcli'], classifiers=[ 'Environment :: Console', 'Environment :: Web Environment', diff --git a/tools/requirements.txt b/tools/requirements.txt index 17bba9467..cd4a89429 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,7 @@ -requests == 2.19.1 -click >= 5, < 7 -prettytable >= 0.7.0 six >= 1.7.0 -prompt_toolkit -urllib3 == 1.22 +ptable >= 0.9.2 +click >= 7 +requests >= 2.20.0 +prompt_toolkit >= 0.53 +pygments >= 2.0.0 +urllib3 >= 1.24 \ No newline at end of file diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt index 138fe84db..56ba8fe65 100644 --- a/tools/test-requirements.txt +++ b/tools/test-requirements.txt @@ -4,5 +4,10 @@ pytest-cov mock sphinx testtools -urllib3 == 1.22 -requests == 2.19.1 +six >= 1.7.0 +ptable >= 0.9.2 +click >= 7 +requests >= 2.20.0 +prompt_toolkit >= 0.53 +pygments >= 2.0.0 +urllib3 >= 1.24 \ No newline at end of file