Tox fixes

Author: allmightyspiff

SoftLayer/API.py

@@ -6,19 +6,20 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=invalid-name
+import time
+import warnings
+
 import json
 import logging
 import requests
-import warnings
-import time
+
 
 from SoftLayer import auth as slauth
 from SoftLayer import config
 from SoftLayer import consts
 from SoftLayer import exceptions
 from SoftLayer import transports
 
-from pprint import pprint as pp
 LOGGER = logging.getLogger(__name__)
 API_PUBLIC_ENDPOINT = consts.API_PUBLIC_ENDPOINT
 API_PRIVATE_ENDPOINT = consts.API_PRIVATE_ENDPOINT
@@ -188,7 +189,7 @@ def __init__(self, auth=None, transport=None, config_file=None):
                     verify=self.settings['softlayer'].getboolean('verify'),
                 )
 
-        self.transport = transport  
+        self.transport = transport
 
     def authenticate_with_password(self, username, password,
                                    security_question_id=None,
@@ -357,15 +358,15 @@ def __repr__(self):
     def __len__(self):
         return 0
 
+
 class IAMClient(BaseClient):
     """IBM ID Client for using IAM authentication
 
     :param auth: auth driver that looks like SoftLayer.auth.AuthenticationBase
     :param transport: An object that's callable with this signature: transport(SoftLayer.transports.Request)
     """
 
-
-    def authenticate_with_password(self, username, password):
+    def authenticate_with_password(self, username, password, security_question_id=None, security_question_answer=None):
         """Performs IBM IAM Username/Password Authentication
 
         :param string username: your IBMid username
@@ -394,14 +395,14 @@ def authenticate_with_password(self, username, password):
             auth=requests.auth.HTTPBasicAuth('bx', 'bx')
         )
         if response.status_code != 200:
-            LOGGER.error("Unable to login: {}".format(response.text))
+            LOGGER.error("Unable to login: %s", response.text)
 
         response.raise_for_status()
 
         tokens = json.loads(response.text)
         self.settings['softlayer']['access_token'] = tokens['access_token']
         self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
-        
+
         config.write_config(self.settings, self.config_file)
         self.auth = slauth.BearerAuthentication('', tokens['access_token'], tokens['refresh_token'])
 
@@ -434,7 +435,7 @@ def authenticate_with_passcode(self, passcode):
             auth=requests.auth.HTTPBasicAuth('bx', 'bx')
         )
         if response.status_code != 200:
-            LOGGER.error("Unable to login: {}".format(response.text))
+            LOGGER.error("Unable to login: %s", response.text)
 
         response.raise_for_status()
 
@@ -443,7 +444,7 @@ def authenticate_with_passcode(self, passcode):
         self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
         a_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['expiration']))
         r_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['refresh_token_expiration']))
-        LOGGER.warning("Tokens retrieved, expires at {}, Refresh expires at {}".format(a_expire, r_expire))
+        LOGGER.warning("Tokens retrieved, expires at %s, Refresh expires at %s", a_expire, r_expire)
         config.write_config(self.settings, self.config_file)
         self.auth = slauth.BearerAuthentication('', tokens['access_token'], tokens['refresh_token'])
 
@@ -489,16 +490,16 @@ def refresh_iam_token(self, r_token, account_id=None, ims_account=None):
             headers=headers,
             auth=requests.auth.HTTPBasicAuth('bx', 'bx')
         )
-        
+
         if response.status_code != 200:
-            LOGGER.warning("Unable to refresh IAM Token. {}".format(response.text))
-        
+            LOGGER.warning("Unable to refresh IAM Token. %s", response.text)
+
         response.raise_for_status()
-       
+
         tokens = json.loads(response.text)
         a_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['expiration']))
         r_expire = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(tokens['refresh_token_expiration']))
-        LOGGER.warning("Successfully refreshed Tokens. Expires at {}, Refresh expires at {}".format(a_expire, r_expire))
+        LOGGER.warning("Tokens retrieved, expires at %s, Refresh expires at %s", a_expire, r_expire)
 
         self.settings['softlayer']['access_token'] = tokens['access_token']
         self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
@@ -513,9 +514,7 @@ def call(self, service, method, *args, **kwargs):
         except exceptions.SoftLayerAPIError as ex:
 
             if ex.faultCode == 401:
-                LOGGER.warning("Token has expired, trying to refresh. {}".format(ex.faultString))
-                # self.refresh_iam_token(r_token)
-                # return super().call(service, method, *args, **kwargs)
+                LOGGER.warning("Token has expired, trying to refresh. %s", ex.faultString)
                 return ex
             else:
                 raise ex

SoftLayer/CLI/config/setup.py

@@ -1,10 +1,11 @@
 """Setup CLI configuration."""
 # :license: MIT, see LICENSE for more details.
+import webbrowser
+
 import configparser
 import json
-import requests
 import os.path
-import webbrowser
+import requests
 
 import click
 
@@ -13,11 +14,9 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
-from SoftLayer import config as base_config
 from SoftLayer.consts import USER_AGENT
 from SoftLayer import utils
 
-from pprint import pprint as pp
 
 def get_api_key(client, username, secret):  # pylint: disable=inconsistent-return-statements
     """Attempts API-Key and password auth to get an API key.
@@ -66,31 +65,26 @@ def cli(env, auth):
     """
     username = None
     api_key = None
-    
+
     timeout = 0
     defaults = config.get_settings_from_client(env.client)
-    endpoint_url =  defaults.get('endpoint_url', 'public')
-    # endpoint_url = get_endpoint_url(env, defaults.get('endpoint_url', 'public'))
+    endpoint_url = get_endpoint_url(env, defaults.get('endpoint_url', 'public'))
     # Get ths username and API key
     if auth == 'ibmid':
-        print("Logging in with IBMid")
         username, api_key = ibmid_login(env)
-        
+
     elif auth == 'cloud_key':
         username = 'apikey'
-        secret = env.input('Classic Infrastructue API Key', default=defaults['api_key'])
+        secret = env.getpass('Classic Infrastructue API Key', default=defaults['api_key'])
         new_client = SoftLayer.Client(username=username, api_key=secret, endpoint_url=endpoint_url, timeout=timeout)
         api_key = get_api_key(new_client, username, secret)
 
-    elif auth =='sso':
-        print("Using SSO for login")
+    elif auth == 'sso':
         username, api_key = sso_login(env)
-    else:
-        print("Using a Classic Infrastructure API key")
 
+    else:
         username = env.input('Classic Infrastructue Username', default=defaults['username'])
-        secret = env.input('Classic Infrastructue API Key', default=defaults['api_key'])
-
+        secret = env.getpass('Classic Infrastructue API Key', default=defaults['api_key'])
         new_client = SoftLayer.Client(username=username, api_key=secret, endpoint_url=endpoint_url, timeout=timeout)
         api_key = get_api_key(new_client, username, secret)
 
@@ -148,32 +142,26 @@ def get_endpoint_url(env, endpoint='public'):
             endpoint_url = env.input('Endpoint URL', default=endpoint)
         else:
             endpoint_url = endpoint_type
-
-
     return endpoint_url
 
+
 def ibmid_login(env):
     """Uses an IBMid and Password to get an access token, and that access token to get an API key"""
     email = env.input("Email").strip()
     password = env.getpass("Password").strip()
 
-    account_id = ''
-    ims_id = ''
-    sl_config = base_config.get_config(env.config_file)
-    # tokens = {'access_token': sl_config['softlayer']['access_token'], 'refresh_token': sl_config['softlayer']['refresh_token']}
     client = SoftLayer.API.IAMClient(config_file=env.config_file)
-    
+
     # STEP 1: Get the base IAM Token with a username/password
     tokens = client.authenticate_with_password(email, password)
 
     # STEP 2: Figure out which account we want to use
     account = get_accounts(env, tokens['access_token'])
-    
+
     # STEP 3: Refresh Token, using a specific account this time.
     tokens = client.refresh_iam_token(tokens['refresh_token'], account['account_id'], account['ims_id'])
 
     # STEP 4: Get or create the Classic Infrastructure API key
-    # client.authenticate_with_iam_token(tokens['access_token'])
     user = client.call('SoftLayer_Account', 'getCurrentUser', mask="mask[id,username,apiAuthenticationKeys]")
 
     if len(user.get('apiAuthenticationKeys', [])) == 0:
@@ -220,12 +208,11 @@ def get_accounts(env, a_token):
                 ims_id = "Unlinked"
             env.fout("{}: {} ({})".format(counter, utils.lookup(selected, 'entity', 'name'), ims_id))
             counter = counter + 1
-        ims_id = None # Reset ims_id to avoid any mix-match or something.
+        ims_id = None  # Reset ims_id to avoid any mix-match or something.
         choice = click.prompt('Enter a number', type=int)
         # Test to make sure choice is not out of bounds...
         selected = accounts['resources'][choice - 1]
 
-
     account_id = utils.lookup(selected, 'metadata', 'guid')
     links = utils.lookup(selected, 'metadata', 'linked_accounts') or []
     for link in links:
@@ -256,11 +243,9 @@ def get_sso_url():
     data = json.loads(response.text)
     return data.get('passcode_endpoint')
 
+
 def sso_login(env):
     """Uses a SSO token to get a SL apikey"""
-    account_id = ''
-    ims_id = ''
-
     passcode_url = get_sso_url()
     env.fout("Get a one-time code from {} to proceed.".format(passcode_url))
     open_browser = env.input("Open the URL in the default browser? [Y/n]", default='Y')
@@ -287,4 +272,4 @@ def sso_login(env):
         api_key = client.call('User_Customer', 'addApiAuthenticationKey', id=user['id'])
     else:
         api_key = user['apiAuthenticationKeys'][0]['authenticationKey']
-    return user.get('username'), api_key
+    return user.get('username'), api_key

SoftLayer/auth.py

@@ -7,8 +7,6 @@
 """
 # pylint: disable=no-self-use
 
-from SoftLayer import config
-
 __all__ = [
     'BasicAuthentication',
     'TokenAuthentication',
@@ -112,6 +110,7 @@ def get_request(self, request):
     def __repr__(self):
         return "BasicHTTPAuthentication(username=%r)" % self.username
 
+
 class BearerAuthentication(AuthenticationBase):
     """Bearer Token authentication class.
 
@@ -121,7 +120,7 @@ class BearerAuthentication(AuthenticationBase):
 
     def __init__(self, username, token, r_token=None):
         """For using IBM IAM authentication
-        
+
         :param username str: Not really needed, will be set to their current username though for logging
         :param token str: the IAM Token
         :param r_token str: The refresh Token, optional
@@ -137,4 +136,4 @@ def get_request(self, request):
         return request
 
     def __repr__(self):
-        return "BearerAuthentication(username={}, token={})".format(self.username, self.api_key)
+        return "BearerAuthentication(username={}, token={})".format(self.username, self.api_key)

SoftLayer/config.py

@@ -12,6 +12,7 @@
 
 LOGGER = logging.getLogger(__name__)
 
+
 def get_client_settings_args(**kwargs):
     """Retrieve client settings from user-supplied arguments.
 
@@ -96,16 +97,18 @@ def get_client_settings(**kwargs):
 
 
 def get_config(config_file=None):
+    """Returns a parsed config object"""
     if config_file is None:
         config_file = '~/.softlayer'
     config = configparser.ConfigParser()
     config.read(os.path.expanduser(config_file))
     return config
 
+
 def write_config(configuration, config_file=None):
+    """Writes a configuration to config_file"""
     if config_file is None:
         config_file = '~/.softlayer'
     config_file = os.path.expanduser(config_file)
-    LOGGER.warning("Updating config file {} with new access tokens".format(config_file))
     with open(config_file, 'w') as file:
-        configuration.write(file)
+        configuration.write(file)