Skip to content

Commit 1a089de

Browse files
authored
Merge pull request nficano#80 from Aameer/patch-1
adding region to `get_account_id` avoid failures
2 parents 7b75ecd + 8c1722f commit 1a089de

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

aws_lambda/aws_lambda.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,12 @@ def get_role_name(region, account_id, role):
439439
return 'arn:{0}:iam::{1}:role/{2}'.format(prefix, account_id, role)
440440

441441

442-
def get_account_id(aws_access_key_id, aws_secret_access_key):
442+
def get_account_id(aws_access_key_id, aws_secret_access_key,region=None):
443443
"""Query STS for a users' account_id"""
444-
client = get_client('sts', aws_access_key_id, aws_secret_access_key)
444+
client = get_client(
445+
'sts', aws_access_key_id, aws_secret_access_key,
446+
region
447+
)
445448
return client.get_caller_identity().get('Account')
446449

447450

@@ -464,7 +467,7 @@ def create_function(cfg, path_to_zip_file, *use_s3, **s3_file):
464467
aws_access_key_id = cfg.get('aws_access_key_id')
465468
aws_secret_access_key = cfg.get('aws_secret_access_key')
466469

467-
account_id = get_account_id(aws_access_key_id, aws_secret_access_key)
470+
account_id = get_account_id(aws_access_key_id, aws_secret_access_key,cfg.get('region'))
468471
role = get_role_name(
469472
cfg.get('region'), account_id,
470473
cfg.get('role', 'lambda_basic_execution'),
@@ -534,7 +537,7 @@ def update_function(cfg, path_to_zip_file, *use_s3, **s3_file):
534537
aws_access_key_id = cfg.get('aws_access_key_id')
535538
aws_secret_access_key = cfg.get('aws_secret_access_key')
536539

537-
account_id = get_account_id(aws_access_key_id, aws_secret_access_key)
540+
account_id = get_account_id(aws_access_key_id, aws_secret_access_key, cfg.get('region'))
538541
role = get_role_name(
539542
cfg.get('region'), account_id,
540543
cfg.get('role', 'lambda_basic_execution'),

0 commit comments

Comments
 (0)