Address comments from PR #19:

* Style fix in aws.py
* Move code inside try block in main.py

Author: nathan-v

nd_okta_auth/aws.py

@@ -180,8 +180,7 @@ def assume_role(self):
             try:
                 if len(self.assertion.roles()) > 1:
                     raise MultipleRoles
-                else:
-                    self.role = self.assertion.roles()[0]
+                self.role = self.assertion.roles()[0]
             except xml.etree.ElementTree.ParseError:
                 log.error('Could not find any Role in the SAML assertion')
                 log.error(self.assertion.__dict__)

nd_okta_auth/main.py

@@ -170,13 +170,13 @@ def main(argv):
             time.sleep(15)
             continue
 
-        # Only set up the session if it's still None
-        if session is None:
-            assertion = okta_client.get_assertion(appid=config.appid,
-                                                  apptype='amazon_aws')
-            session = aws.Session(assertion, profile=config.name)
-
         try:
+            # Only set up the session if it's still None
+            if session is None:
+                assertion = okta_client.get_assertion(appid=config.appid,
+                                                      apptype='amazon_aws')
+                session = aws.Session(assertion, profile=config.name)
+
             log.info('Getting SAML Assertion from {org}'.format(
               org=config.org))
             session.assume_role()