fix the merge conflicts

Author: caberos

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# Use `allow` to specify which dependencies to maintain
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-update
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "pip prod"
+      prefix-development: "pip dev"
+      include: "scope"

SoftLayer/CLI/block/options.py

@@ -27,7 +27,11 @@ def cli(env):
     iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
     snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
     storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
-    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName', 'Notes'], title='Datacenter')
+    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+    storage_table.align['Description'] = 'l'
+    storage_table.align['KeyName'] = 'l'
+    storage_table.sortby = 'Id'
 
     for datacenter in datacenters:
         closure = []
@@ -45,7 +49,7 @@ def cli(env):
     for item in items:
         if item['itemCategory']['categoryCode'] == 'performance_storage_space':
             storage_table.add_row([item.get('id'), item.get('description'),
-                                   item.get('keyName')])
+                                   item.get('keyName'), item.get('capacityMinimum') or '-'])
 
         if item['itemCategory']['categoryCode'] == 'storage_tier_level':
             iops_table.add_row([item.get('id'), item.get('description'),

SoftLayer/CLI/dedicatedhost/create_options.py

@@ -58,4 +58,4 @@ def cli(env, **kwargs):
             br_table.add_row([router['hostname']])
         tables.append(br_table)
 
-    env.fout(formatting.listing(tables, separator='\n'))
+    env.fout(tables)

SoftLayer/CLI/file/options.py

@@ -8,7 +8,6 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
-
 PACKAGE_STORAGE = 759
 
 
@@ -27,8 +26,12 @@ def cli(env):
 
     iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
     snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
-    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
-    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName', 'Notes'], title='Datacenter')
+    file_storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
+    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+    file_storage_table.align['Description'] = 'l'
+    file_storage_table.align['KeyName'] = 'l'
+    file_storage_table.sortby = 'Id'
 
     for datacenter in datacenters:
         closure = []
@@ -45,8 +48,8 @@ def cli(env):
 
     for item_file in items:
         if item_file['itemCategory']['categoryCode'] == 'performance_storage_space':
-            storage_table.add_row([item_file.get('id'), item_file.get('description'),
-                                   item_file.get('keyName')])
+            file_storage_table.add_row([item_file.get('id'), item_file.get('description'),
+                                        item_file.get('keyName')])
 
         if item_file['itemCategory']['categoryCode'] == 'storage_tier_level':
             iops_table.add_row([item_file.get('id'), item_file.get('description'),
@@ -58,5 +61,5 @@ def cli(env):
 
     env.fout(datacenter_table)
     env.fout(iops_table)
-    env.fout(storage_table)
+    env.fout(file_storage_table)
     env.fout(snapshot_table)

SoftLayer/CLI/hardware/create_options.py

@@ -51,9 +51,7 @@ def cli(env, prices, location=None):
     tables.append(_port_speed_prices_table(options['port_speeds'], prices))
     tables.append(_extras_prices_table(options['extras'], prices))
     tables.append(_get_routers(routers))
-
-    # since this is multiple tables, this is required for a valid JSON object to be rendered.
-    env.fout(formatting.listing(tables, separator='\n'))
+    env.fout(tables)
 
 
 def _preset_prices_table(sizes, prices=False):

setup.py

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

tools/requirements.txt

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