Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added region as a parameter for aws-mfa. #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added region as a parameter for aws-mfa. #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions awsmfa/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def main():
parser.add_argument('--force',
help="Refresh credentials even if currently valid.",
action="store_true",
required=False)
required=False,
default=True)
parser.add_argument('--log-level',
help="Set log level",
choices=[
Expand All @@ -83,6 +84,10 @@ def main():
type=str,
help="Provide MFA token as an argument",
required=False)
parser.add_argument('--region',
type=str,
help="Provide aws region",
required=False)
args = parser.parse_args()

level = getattr(logging, args.log_level)
Expand Down Expand Up @@ -178,6 +183,14 @@ def validate(args, config):
'You must provide --device or MFA_DEVICE or set '
'"aws_mfa_device" in ".aws/credentials"')

if not args.region:
if config.has_option(long_term_name, 'region'):
args.region = config.get(long_term_name, 'region')
else:
log_error_and_exit(logger,
'You must provide --region or set '
'"region" in ".aws/credentials"')

# get assume_role from param or env var
if not args.assume_role:
if os.environ.get('MFA_ASSUME_ROLE'):
Expand Down Expand Up @@ -284,12 +297,12 @@ def get_credentials(short_term_name, lt_key_id, lt_access_key, args, config):
console_input = prompter()
mfa_token = console_input('Enter AWS MFA code for device [%s] '
'(renewing for %s seconds):' %
(args.device, args.duration))

(args.device, args.duration))
client = boto3.client(
'sts',
aws_access_key_id=lt_key_id,
aws_secret_access_key=lt_access_key
aws_secret_access_key=lt_access_key,
region_name = args.region
)

if args.assume_role:
Expand Down