Merge branch 'master' into issue1989

Author: edsonarios

SoftLayer/CLI/block/access/list.py

@@ -14,10 +14,10 @@
 @click.argument('volume_id')
 @click.option('--columns',
               callback=column_helper.get_formatter(storage_utils.COLUMNS),
-              help=f"Columns to display. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
+              help=f"Columns to display. Options are: {', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default=','.join(storage_utils.DEFAULT_COLUMNS))
 @click.option('--sortby',
-              help=f"Column to sort by. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
+              help=f"Column to sort by. Options are: {', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default='name')
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):

SoftLayer/CLI/block/list.py

@@ -60,7 +60,7 @@
 @click.option('--sortby', help='Column to sort by', default='username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, sortby, columns, datacenter, username, storage_type, order):

SoftLayer/CLI/block/replication/locations.py

@@ -24,7 +24,7 @@
 @click.argument('volume-id')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @click.option('--sortby', help='Column to sort by', default='Long Name')
 @environment.pass_env

SoftLayer/CLI/block/replication/partners.py

@@ -16,7 +16,7 @@
 @click.argument('volume-id')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @click.option('--sortby', help='Column to sort by', default='Username')
 @environment.pass_env

SoftLayer/CLI/block/snapshot/list.py

@@ -32,7 +32,7 @@
               default='created')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
+              help=f"Columns to display. Options: {', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, volume_id, sortby, columns):

SoftLayer/CLI/call_api.py

@@ -77,10 +77,9 @@ def _validate_filter(ctx, param, value):  # pylint: disable=unused-argument
         try:
             _filter = json.loads(value)
             if not isinstance(_filter, dict):
-                raise exceptions.CLIAbort("\"{}\" should be a JSON object, but is a {} instead.".
-                                          format(_filter, type(_filter)))
+                raise exceptions.CLIAbort(f"\"{_filter}\" should be a JSON object, but is a {type(_filter)} instead.")
         except json.JSONDecodeError as error:
-            raise exceptions.CLIAbort("\"{}\" is not valid JSON. {}".format(value, error))
+            raise exceptions.CLIAbort(f"\"{value}\" is not valid JSON. {error}")
 
     return _filter
 
@@ -96,8 +95,8 @@ def _validate_parameters(ctx, param, value):  # pylint: disable=unused-argument
                 try:
                     parameter = json.loads(parameter)
                 except json.JSONDecodeError as error:
-                    click.secho("{} looked like json, but was invalid, passing to API as is. {}".
-                                format(parameter, error), fg='red')
+                    click.secho(f"{parameter} looked like json, but was invalid, passing to API as is. {error}",
+                                fg='red')
         validated_values.append(parameter)
     return validated_values
 

SoftLayer/CLI/cdn/delete.py

@@ -18,4 +18,4 @@ def cli(env, unique_id):
     cdn = manager.delete_cdn(unique_id)
 
     if cdn:
-        env.fout("Cdn with uniqueId: {} was deleted.".format(unique_id))
+        env.fout(f"Cdn with uniqueId: {unique_id} was deleted.")

SoftLayer/CLI/config/setup.py

@@ -171,7 +171,7 @@ def ibmid_login(env):
     user = client.call('SoftLayer_Account', 'getCurrentUser', mask="mask[id,username,apiAuthenticationKeys]")
 
     if len(user.get('apiAuthenticationKeys', [])) == 0:
-        env.fout("Creating a Classic Infrastrucutre API key for {}".format(user['username']))
+        env.fout(f"Creating a Classic Infrastrucutre API key for {user['username']}")
         api_key = client.call('User_Customer', 'addApiAuthenticationKey', id=user['id'])
     else:
         api_key = user['apiAuthenticationKeys'][0]['authenticationKey']
@@ -188,7 +188,7 @@ def get_accounts(env, a_token):
         'User-Agent': USER_AGENT,
         'Accept': 'application/json'
     }
-    headers['Authorization'] = 'Bearer {}'.format(a_token)
+    headers['Authorization'] = f'Bearer {a_token}'
     response = iam_client.request(
         'GET',
         'https://accounts.cloud.ibm.com/v1/accounts',
@@ -212,7 +212,7 @@ def get_accounts(env, a_token):
                     ims_id = link.get('id')
             if ims_id is None:
                 ims_id = "Unlinked"
-            env.fout("{}: {} ({})".format(counter, utils.lookup(selected, 'entity', 'name'), ims_id))
+            env.fout(f"{counter}: {utils.lookup(selected, 'entity', 'name')} ({ims_id})")
             counter = counter + 1
         ims_id = None  # Reset ims_id to avoid any mix-match or something.
         choice = click.prompt('Enter a number', type=int)
@@ -225,7 +225,7 @@ def get_accounts(env, a_token):
         if link.get('origin') == "IMS":
             ims_id = link.get('id')
 
-    print("Using account {}".format(utils.lookup(selected, 'entity', 'name')))
+    print(f"Using account {utils.lookup(selected, 'entity', 'name')}")
     return {"account_id": account_id, "ims_id": ims_id}
 
 
@@ -253,7 +253,7 @@ def get_sso_url():
 def sso_login(env):
     """Uses a SSO token to get a SL apikey"""
     passcode_url = get_sso_url()
-    env.fout("Get a one-time code from {} to proceed.".format(passcode_url))
+    env.fout(f"Get a one-time code from {passcode_url} to proceed.")
     open_browser = env.input("Open the URL in the default browser? [Y/n]", default='Y')
     if open_browser.lower() == 'y':
         webbrowser.open(passcode_url)
@@ -274,7 +274,7 @@ def sso_login(env):
     user = client.call('SoftLayer_Account', 'getCurrentUser', mask="mask[id,username,apiAuthenticationKeys]")
 
     if len(user.get('apiAuthenticationKeys', [])) == 0:
-        env.fout("Creating a Classic Infrastrucutre API key for {}".format(user['username']))
+        env.fout(f"Creating a Classic Infrastrucutre API key for {user['username']}")
         api_key = client.call('User_Customer', 'addApiAuthenticationKey', id=user['id'])
     else:
         api_key = user['apiAuthenticationKeys'][0]['authenticationKey']

SoftLayer/CLI/core.py

@@ -46,7 +46,7 @@ def get_latest_version():
     try:
         result = requests.get('https://pypi.org/pypi/SoftLayer/json',  timeout=60)
         json_result = result.json()
-        latest = 'v{}'.format(json_result['info']['version'])
+        latest = f"v{json_result['info']['version']}"
     except Exception:
         latest = "Unable to get version from pypi."
     return latest
@@ -65,8 +65,7 @@ def get_version_message(ctx, param, value):
         return
     current = SoftLayer.consts.VERSION
     latest = get_latest_version()
-    click.secho("Current: {prog} {current}\nLatest:  {prog} {latest}".format(
-        prog=PROG_NAME, current=current, latest=latest))
+    click.secho(f"Current: {PROG_NAME} {current}\nLatest:  {PROG_NAME} {latest}")
     ctx.exit()
 
 
@@ -158,7 +157,7 @@ def output_diagnostics(env, result, verbose=0, **kwargs):
 
     if verbose > 1:
         for call in env.client.transport.get_last_calls():
-            call_table = formatting.Table(['', '{}::{}'.format(call.service, call.method)], align="left")
+            call_table = formatting.Table(['', f'{call.service}::{call.method}'], align="left")
             nice_mask = ''
             if call.mask is not None:
                 nice_mask = call.mask

SoftLayer/CLI/custom_types.py

@@ -30,4 +30,4 @@ def convert(self, value, param, ctx):
             ip_address, cidr = address
             return (ip_address, int(cidr))
         except ValueError:
-            self.fail('{} is not a valid network'.format(value), param, ctx)
+            self.fail(f'{value} is not a valid network', param, ctx)