.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"

.github/workflows/release.yml

@@ -46,6 +46,7 @@ jobs:
     - name: Publish 📦 to Test PyPI
       uses: pypa/gh-action-pypi-publish@master
       with:
-        password: ${{ secrets.CGALLO_TEST_PYPI }}
-        repository_url: https://test.pypi.org/legacy/
+        user: __token__
+        password: ${{ secrets.CGALLO_PYPI }}
+        repository_url: https://pypi.org/legacy/
 

CHANGELOG.md

@@ -1,10 +1,46 @@
 # Change Log
 
+## [6.1.1] - 2022-08-18
+
+#### What's Changed
+* v6.1.0 Changelog and version bump by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1674
+* item-list fix by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1679
+* updating release job to actually publish to pypi by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1680
+* Update command - slcli object-storage endpoints by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1685
+* add the block volume-options command by @caberos in https://github.com/softlayer/softlayer-python/pull/1681
+* add the file volume-options command by @caberos in https://github.com/softlayer/softlayer-python/pull/1684
+* fixed issues where a message warned users about closing datacenter by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1688
+* Enable --format=raw and fixes table width  by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1689
+* Update `slcli hardware sensor` by @BrianSantivanez in https://github.com/softlayer/softlayer-python/pull/1691
+* Improved successful response to command - slcli vs cancel by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1695
+* Fixed an issue with printing tables that contained empty items by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1697
+* Added a dependabot scanner  by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1699
+* block|file volume-options improvements by @caberos in https://github.com/softlayer/softlayer-python/pull/1700
+* Option create-options in commands hardware and dedicatedhost fixed by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1703
+* pip prod(deps): bump rich from 12.3.0 to 12.5.1 by @dependabot in https://github.com/softlayer/softlayer-python/pull/1704
+* block/file volume-options improvements 2 by @caberos in https://github.com/softlayer/softlayer-python/pull/1702
+* New command ipsec order by @caberos in https://github.com/softlayer/softlayer-python/pull/1698
+* block/file volume-options improvement 3 by @caberos in https://github.com/softlayer/softlayer-python/pull/1705
+* Command slcli vlan create - displaying an error message by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1707
+* New Command: user device-access by @caberos in https://github.com/softlayer/softlayer-python/pull/1712
+* Command slcli vlan edit accept that we do not send any parameters by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1709
+* Updated command - slcli vlan list by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1713
+* `slcli block subnets-list` command display an error message by @BrianSantivanez in https://github.com/softlayer/softlayer-python/pull/1716
+* add user remove-access command by @caberos in https://github.com/softlayer/softlayer-python/pull/1717
+* Add Devices with Trunks to vlan detail by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1721
+* slcli hardware reflash-firmware command does not display success message by @BrianSantivanez in https://github.com/softlayer/softlayer-python/pull/1724
+* Fix bug with command - slcli cdn edit by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1726
+
+#### New Contributors
+* @dependabot made their first contribution in https://github.com/softlayer/softlayer-python/pull/1704
+
+**Full Changelog**: https://github.com/softlayer/softlayer-python/compare/v6.1.0...v6.1.1
+
 
 
 ## [6.1.0] - 2022-06-30
 
-## Major Updates
+#### Major Updates
 * [Rich](https://github.com/Textualize/rich) tables by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1646
 * [Rich](https://github.com/Textualize/rich) Text support by @allmightyspiff in https://github.com/softlayer/softlayer-python/pull/1635
 
@@ -14,7 +50,7 @@ Rich Text and Rich Tables will modernize the output of the SLCLI to be a little
 ![image](https://user-images.githubusercontent.com/7408017/176753845-32af33f0-454f-4bab-ac63-1ae3db788ede.png)
 
 
-## What's Changed
+#### What's Changed
 * slcli licenses is missing the help text by @caberos in https://github.com/softlayer/softlayer-python/pull/1605
 * Add a warning if user orders in a POD that is being closed by @caberos in https://github.com/softlayer/softlayer-python/pull/1600
 * updated number of updates in the command account event-detail by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1609
@@ -50,15 +86,15 @@ Rich Text and Rich Tables will modernize the output of the SLCLI to be a little
 * new feature block object-storage permissions command by @caberos in https://github.com/softlayer/softlayer-python/pull/1668
 * fix the vlan table by @caberos in https://github.com/softlayer/softlayer-python/pull/1672
 
-## New Contributors
+#### New Contributors
 * @BrianSantivanez made their first contribution in https://github.com/softlayer/softlayer-python/pull/1629
 
 **Full Changelog**: https://github.com/softlayer/softlayer-python/compare/v6.0.2...v6.1.0
 
 
-## [6.0.2] - 2022-03-30
+### [6.0.2] - 2022-03-30
 
-## What's Changed
+#### What's Changed
 * New Command slcli hardware|virtual monitoring by @caberos in https://github.com/softlayer/softlayer-python/pull/1593
 * When listing datacenters/pods, mark those that are closing soon. by @caberos in https://github.com/softlayer/softlayer-python/pull/1597
 
@@ -68,7 +104,7 @@ Rich Text and Rich Tables will modernize the output of the SLCLI to be a little
 ## [6.0.1] - 2022-03-11
 
 
-## What's Changed
+#### What's Changed
 * Replace the use of ptable with prettytable by @dvzrv in https://github.com/softlayer/softlayer-python/pull/1584
 * Bandwidth pool management by @caberos in https://github.com/softlayer/softlayer-python/pull/1582
 * Add id in the result in the command bandwidth-pools by @edsonarios in https://github.com/softlayer/softlayer-python/pull/1586

SoftLayer/CLI/block/options.py

@@ -0,0 +1,109 @@
+"""List all options for ordering a block storage."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI.command import SLCommand
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+PACKAGE_STORAGE = 759
+
+
+@click.command(cls=SLCommand)
+@click.argument('location', required=False)
+@click.option('--prices', '-p', is_flag=True,
+              help='Use --prices to list the server item prices, and to list the Item Prices by location,'
+                   'add it to the --prices option using location short name, e.g. --prices dal13')
+@environment.pass_env
+def cli(env, prices, location=None):
+    """List all options for ordering a block storage"""
+
+    order_manager = SoftLayer.OrderingManager(env.client)
+    items = order_manager.get_items(PACKAGE_STORAGE)
+    datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
+
+    tables = []
+    network = SoftLayer.NetworkManager(env.client)
+    pods = network.get_closed_pods()
+
+    if datacenters != []:
+        datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+        for datacenter in datacenters:
+            closure = []
+            for pod in pods:
+                if datacenter['location']['location']['name'] in str(pod['name']):
+                    closure.append(pod['name'])
+
+            notes = '-'
+            if len(closure) > 0:
+                notes = 'closed soon: %s' % (', '.join(closure))
+            datacenter_table.add_row([datacenter['location']['locationId'],
+                                      datacenter.get('description'),
+                                      datacenter['keyname'], notes])
+        tables.append(datacenter_table)
+    else:
+        raise exceptions.CLIAbort('Location does not exit.')
+
+    tables.append(_block_ios_get_table(items, prices))
+    tables.append(_block_storage_table(items, prices))
+    tables.append(_block_snapshot_get_table(items, prices))
+    env.fout(tables)
+
+
+def _block_ios_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], title='IOPS')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'storage_tier_level':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName'), block_item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'storage_tier_level':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName')])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table
+
+
+def _block_storage_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum', 'Prices'], title='Storage')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'performance_storage_space':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName'), block_item.get('capacityMinimum') or '-',
+                               block_item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum'], title='Storage')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'performance_storage_space':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName'), block_item.get('capacityMinimum') or '-', ])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table
+
+
+def _block_snapshot_get_table(items, prices):
+    if prices:
+        table = formatting.Table(['Id', 'Description', 'KeyName', 'Prices'], title='Snapshot')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName'), block_item['prices'][0]['recurringFee']])
+    else:
+        table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
+        for block_item in items:
+            if block_item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
+                table.add_row([block_item.get('id'), block_item.get('description'),
+                               block_item.get('keyName')])
+    table.sortby = 'Id'
+    table.align = 'l'
+    return table

SoftLayer/CLI/block/subnets/list.py

@@ -10,7 +10,6 @@
 
 COLUMNS = [
     'id',
-    'createDate',
     'networkIdentifier',
     'cidr'
 ]
@@ -33,7 +32,6 @@ def cli(env, access_id):
         table = formatting.Table(COLUMNS)
         for subnet in subnets:
             row = ["{0}".format(subnet['id']),
-                   "{0}".format(subnet['createDate']),
                    "{0}".format(subnet['networkIdentifier']),
                    "{0}".format(subnet['cidr'])]
             table.add_row(row)

SoftLayer/CLI/cdn/edit.py

@@ -19,6 +19,10 @@
               type=click.INT,
               help="HTTP port."
               )
+@click.option('--https-port', '-s',
+              type=click.INT,
+              help="HTTPS port."
+              )
 @click.option('--origin', '-o',
               type=click.STRING,
               help="Origin server address."
@@ -39,7 +43,7 @@
                    "the Dynamic content acceleration option is not added because this has a special configuration."
               )
 @environment.pass_env
-def cli(env, identifier, header, http_port, origin, respect_headers, cache, performance_configuration):
+def cli(env, identifier, header, http_port, https_port, origin, respect_headers, cache, performance_configuration):
     """Edit a CDN Account.
 
        Note: You can use the hostname or uniqueId as IDENTIFIER.
@@ -56,7 +60,7 @@ def cli(env, identifier, header, http_port, origin, respect_headers, cache, perf
         else:
             cache_result['cacheKeyQueryRule'] = cache[0]
 
-    cdn_result = manager.edit(cdn_id, header=header, http_port=http_port, origin=origin,
+    cdn_result = manager.edit(cdn_id, header=header, http_port=http_port, https_port=https_port, origin=origin,
                               respect_headers=respect_headers, cache=cache_result,
                               performance_configuration=performance_configuration)
 
@@ -67,7 +71,10 @@ def cli(env, identifier, header, http_port, origin, respect_headers, cache, perf
     for cdn in cdn_result:
         table.add_row(['Create Date', cdn.get('createDate')])
         table.add_row(['Header', cdn.get('header')])
-        table.add_row(['Http Port', cdn.get('httpPort')])
+        if cdn.get('httpPort'):
+            table.add_row(['Http Port', cdn.get('httpPort')])
+        if cdn.get('httpsPort'):
+            table.add_row(['Https Port', cdn.get('httpsPort')])
         table.add_row(['Origin Type', cdn.get('originType')])
         table.add_row(['Performance Configuration', cdn.get('performanceConfiguration')])
         table.add_row(['Protocol', cdn.get('protocol')])

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/environment.py

@@ -45,6 +45,10 @@ def __init__(self):
 
     def out(self, output):
         """Outputs a string to the console (stdout)."""
+
+        # If we output to a | or file, need to set default width so all output is printed.
+        if not self.console.is_terminal:
+            self.console.width = 1000000
         if self.format == 'json':
             try:
                 self.console.print_json(output)