Skip to content

Commit

Permalink
fix: remove timezone parsing to make it campatible to python 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
qoomon committed Apr 29, 2020
1 parent cfd45d8 commit 52bcd8c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions aws_session/__main__.py
Expand Up @@ -72,7 +72,7 @@ def handle_session_credentials(args):
expiry_time = datetime.now().astimezone()
expiry_time_value = profile_config.get("aws_session_expiry_time")
if expiry_time_value and not expiry_time_value == "None":
expiry_time = datetime.strptime(expiry_time_value, "%Y-%m-%d %H:%M:%S%z")
expiry_time = datetime.strptime(expiry_time_value, "%Y-%m-%d %H:%M:%S").astimezone()

expiry_duration = expiry_time - datetime.now().astimezone()
if expiry_duration < SESSION_EXPIRATION_THRESHOLD or force_new:
Expand All @@ -82,17 +82,17 @@ def handle_session_credentials(args):
raise Exception(f"Invalid Credentials Type: {type(session_credentials)}")
# populate deferred credentials
session_credentials.get_frozen_credentials()

expiry_time = session_credentials._expiry_time.astimezone()
expiry_duration = expiry_time - datetime.now().astimezone()

profile_update(AWS_CREDENTIALS_PATH, profile_name, {
"aws_access_key_id": session_credentials.access_key,
"aws_secret_access_key": session_credentials.secret_key,
"aws_session_token": session_credentials.token,
"aws_session_expiry_time": session_credentials._expiry_time
"aws_session_expiry_time": expiry_time.strftime("%Y-%m-%d %H:%M:%S")
})

expiry_time = session_credentials._expiry_time
expiry_duration = expiry_time - datetime.now().astimezone()

print(f"Session is valid for {format_timedelta(expiry_duration)}, "
f"until {expiry_time.astimezone().strftime('%Y-%m-%d %H:%M')}")

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -9,7 +9,7 @@ def read_text(file_name):

setuptools.setup(
name='aws-session',
version='4.0.0',
version='4.0.1',
author="Bengt Brodersen",
author_email="me@qoomon.me",
description="A CLI to generate and store session credentials in ~/.aws/credentials file, based on ~/.aws/config profiles",
Expand Down

0 comments on commit 52bcd8c

Please sign in to comment.