Update CI configuration, fix spelling errors, session duration, and add Okta URL support (#98)

* Update CI configuration

* Fix spelling errors (including #96)

* Session duration bug (#80)

* Add Okta full URL support (#65 and #82)

* Fix line length, remove old setup step

* Move pip upgrade to inside the venv

* Version bump

* Update readme

* Fix link in readme

Author: nathan-v

.circleci/config.yml

@@ -8,6 +8,7 @@ dependencies: &dependencies
   command: |
     python -m venv venv || virtualenv venv
     . venv/bin/activate
+    pip install -U pip
     pip install -r requirements.txt
     pip install -r test_requirements.txt
 
@@ -35,6 +36,7 @@ workflows:
   version: 2
   test:
     jobs:
+      - test-3.9
       - test-3.8
       - test-3.7
       - test-3.6
@@ -44,7 +46,7 @@ workflows:
 jobs:
   test-2.7:
     docker:
-      - image: circleci/python:2.7
+      - image: cimg/python:2.7
     steps:
       - checkout
       - run: *dbus
@@ -61,19 +63,24 @@ jobs:
       - run: *pycodestyle
       - run: *pyflakes
     docker:
-      - image: circleci/python:3.5
+      - image: cimg/python:3.5
 
   test-3.6:
     <<: *3x-template
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.6
 
   test-3.7:
     <<: *3x-template
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
 
   test-3.8:
     <<: *3x-template
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
+
+  test-3.9:
+    <<: *3x-template
+    docker:
+      - image: cimg/python:3.9

.gitignore

@@ -14,3 +14,4 @@ __pycache__
 .eggs/
 .tox/
 .python-version
+.DS_Store

README.md

@@ -1,4 +1,4 @@
-[![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/nathan-v/aws_okta_keyman/blob/master/LICENSE.txt) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnathan-v%2Faws_okta_keyman.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnathan-v%2Faws_okta_keyman?ref=badge_shield) [![Python versions](https://img.shields.io/pypi/pyversions/aws-okta-keyman.svg)](https://pypi.python.org/pypi/aws-okta-keyman/) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/aws-okta-keyman) [![Downloads](http://pepy.tech/badge/aws-okta-keyman)](http://pepy.tech/count/aws-okta-keyman)
+[![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/nathan-v/aws_okta_keyman/blob/master/LICENSE.txt) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnathan-v%2Faws_okta_keyman.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnathan-v%2Faws_okta_keyman?ref=badge_shield) [![Python versions](https://img.shields.io/pypi/pyversions/aws-okta-keyman.svg)](https://pypi.python.org/pypi/aws-okta-keyman/) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/aws-okta-keyman) [![Downloads](http://pepy.tech/badge/aws-okta-keyman)](https://pepy.tech/project/aws_okta_keyman)
 
 [![Requirements Status](https://pyup.io/repos/github/nathan-v/aws_okta_keyman/shield.svg?t=1580777582434)](https://pyup.io/repos/github/nathan-v/aws_okta_keyman/) ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/nathan-v/aws_okta_keyman)  ![Code Climate issues](https://img.shields.io/codeclimate/issues/nathan-v/aws_okta_keyman) ![Code Climate technical debt](https://img.shields.io/codeclimate/tech-debt/nathan-v/aws_okta_keyman) ![Codecov](https://img.shields.io/codecov/c/gh/nathan-v/aws_okta_keyman) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/nathan-v/aws_okta_keyman)
 
@@ -37,10 +37,10 @@ Benefits vs other similar tools:
 * No API keys required; just your Okta username and password
 * No analytics or metrics collection; this tool does _not_ call home in any way
 * Open source distributed as source; you can see what you're running
-* Wide Python version support; works on Python 2.7.4+ and 3.5.0+.
+* Wide Python version support; works on Python 2.7.4+ and 3.5.0+. (v 0.8.x)
 
 ### Optional MFA Authentication
-If you organization or integration requires MFA  we will automatically detect that
+If your organization or integration requires MFA we will automatically detect that
 requirement during authentication and prompt the user to complete the
 Multi Factor Authentication.
 

aws_okta_keyman/aws.py

@@ -118,7 +118,7 @@ def __init__(self,
                  profile='default',
                  region='us-east-1',
                  role=None,
-                 session_duration=3600):
+                 session_duration=None):
         cred_dir = os.path.expanduser(credential_path)
         cred_file = os.path.join(cred_dir, 'credentials')
 
@@ -145,7 +145,10 @@ def __init__(self,
             'Expiration': None}
         self.session_token = None
         self.role = role
-        self.duration = session_duration
+        if session_duration:
+            self.duration = session_duration
+        else:
+            self.duration = 3600
         self.available_roles()
 
     @property
@@ -318,7 +321,7 @@ def account_ids_to_names(self, roles):
         try:
             accounts = self.get_account_name_map()
         except Exception:
-            msg = ('Error retreiving AWS account name/ID map. '
+            msg = ('Error retrieving AWS account name/ID map. '
                    'Falling back to just account IDs')
             LOG.warning(msg)
             return roles

aws_okta_keyman/config.py

@@ -187,7 +187,8 @@ def main_args(arg_group, required=False):
                                help=(
                                    'Okta Organization Name - ie, if your '
                                    'login URL is https://foobar.okta.com, '
-                                   'enter in foobar here'
+                                   'enter in foobar here or you may use'
+                                   'the complete URL.'
                                ),
                                required=required)
 
@@ -282,11 +283,11 @@ def optional_args(optional_args):
                                        'by AWS the default of 3600s (one '
                                        'hour) will be used.'
                                    ),
-                                   default=3600)
+                                   default=None)
         optional_args.add_argument('-co', '--console',
                                    action='store_true', help=(
                                        'Output AWS Console URLs to log in '
-                                       'and use the web conle with the '
+                                       'and use the web console with the '
                                        'selected role..'
                                    ),
                                    default=False)
@@ -353,7 +354,7 @@ def write_config(self):
 
         file_folder = os.path.dirname(os.path.abspath(file_path))
         if not os.path.exists(file_folder):
-            LOG.debug("Creating missin config file folder : {}".format(
+            LOG.debug("Creating missing config file folder : {}".format(
                 file_folder))
             os.makedirs(file_folder)
 

aws_okta_keyman/metadata.py

@@ -14,5 +14,5 @@
 # Copyright 2018 Nathan V
 """Package metadata."""
 
-__version__ = '0.8.5'
+__version__ = '0.8.6'
 __desc__ = 'AWS Okta Keyman'

aws_okta_keyman/okta.py

@@ -92,10 +92,14 @@ class Okta(object):
 
     def __init__(self, organization, username, password, duo_factor=None,
                  oktapreview=False):
-        if oktapreview:
-            self.base_url = PREVIEW_BASE_URL.format(organization=organization)
+        if organization and "https://" not in organization:
+            if oktapreview:
+                url = PREVIEW_BASE_URL.format(organization=organization)
+                self.base_url = url
+            else:
+                self.base_url = BASE_URL.format(organization=organization)
         else:
-            self.base_url = BASE_URL.format(organization=organization)
+            self.base_url = organization
 
         LOG.debug('Base URL Set to: {url}'.format(url=self.base_url))
 
@@ -144,7 +148,7 @@ def _request(self, path, data=None):
     def set_token(self, ret):
         """Parse an authentication response, get a long-lived token, store it
         Parses a SUCCESSFUL authentication response from Okta to get the
-        one time use token, requests a long-lived sessoin token from Okta,  and
+        one time use token, requests a long-lived session token from Okta,  and
         stores the new token.
         Args:
             ret: The response from Okta that we know is successful and contains

aws_okta_keyman/test/aws_test.py

@@ -152,6 +152,18 @@ def test_init_folder_exists(self, exists_mock, _makedirs_mock,
 
         exists_mock.assert_has_calls([mock.call('/home/fakeuser')])
 
+    @mock.patch('os.path.expanduser')
+    @mock.patch('os.makedirs')
+    @mock.patch('os.path.exists')
+    def test_init_with_duration(self, exists_mock, _makedirs_mock,
+                                expuser_mock):
+        exists_mock.return_value = True
+        expuser_mock.return_value = '/home/fakeuser'
+
+        aws.Session('BogusAssertion', session_duration=6000)
+
+        exists_mock.assert_has_calls([mock.call('/home/fakeuser')])
+
     def test_is_valid_false(self):
         session = aws.Session('BogusAssertion')
 

requirements.txt

@@ -1,11 +1,11 @@
-beautifulsoup4>=4.4.0
+beautifulsoup4~=4.9.0
 colorlog>=4.0.0
 requests>=2.10.0
 boto3>=1.4.0
 future>=0.16.0
 configparser>=3.5.0
-PyYAML>=5.0
-keyring>=18.0.0; python_version == '3.*'
+PyYAML~=5.3.0
+keyring>=20.0.0; python_version == '3.*'
 keyring~=18.0.0; python_version == '2.7' # pyup: ignore
 SecretStorage>=2.3.1; python_version == '2.7'
 dbus-python>=1.2.12; python_version == '2.7' and sys_platform == 'linux2'

setup.py

@@ -116,7 +116,6 @@ def run_tests(self):
     packages=find_packages(),
     test_suite='pytest',
     tests_require=open("{}/test_requirements.txt".format(DIR)).readlines(),
-    setup_requires=['pytest-runner'],
     install_requires=open("{}/requirements.txt".format(DIR)).readlines(),
     entry_points={
         'console_scripts': [
@@ -135,6 +134,7 @@ def run_tests(self):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',

test_requirements.txt

@@ -1,7 +1,7 @@
-pytest>=4.6.0
-pytest-cov>=2.8.0
-coverage==5.2
-mock>=3.0.0
-pycodestyle>=2.5.0
-pyflakes>=2.1.0
-codecov>=2.0.0
+pytest~=4.6.0
+pytest-cov~=2.12.0
+coverage~=5.5.0
+mock~=3.0.0
+pycodestyle~=2.8.0
+pyflakes~=2.4.0
+codecov~=2.1.0