Merge branch 'master' of github.com:washingtonpost/clokta

clokta/cli.py

@@ -0,0 +1,15 @@
+'''
+This is the entry-point to the cli application.
+'''
+import click
+
+from clokta.role_assumer import RoleAssumer
+
+
+@click.command()
+@click.option('--verbose', '-v', is_flag=True, help='Show detailed')
+@click.option('--profile', '-p', required=True, help='Configuration profile')
+def assume_role(profile, verbose=False):
+    ''' Click point of entry '''
+    assumer = RoleAssumer(profile=profile, verbose=verbose)
+    assumer.assume_role()

clokta/profile_manager.py

@@ -65,7 +65,7 @@ def update_configuration(self, profile_configuration):
         ''' Update a config file section '''
         parser = configparser.ConfigParser()
         parser.read(self.config_location)
-        
+
         default_keys = [
             'okta_username',
             'okta_org'
@@ -109,6 +109,10 @@ def apply_credentials(self, credentials):
         creds = credentials['Credentials']
         parser[self.profile_name]['AWS_ACCESS_KEY_ID'] = creds['AccessKeyId']
         parser[self.profile_name]['AWS_SECRET_ACCESS_KEY'] = creds['SecretAccessKey']
+
+        if 'AWS_SESSION_TOKEN' in parser[self.profile_name]:
+            del parser[self.profile_name]['AWS_SESSION_TOKEN']
+
         if 'SessionToken' in creds:
             parser[self.profile_name]['AWS_SESSION_TOKEN'] = creds['SessionToken']