@@ -439,9 +439,12 @@ def get_role_name(region, account_id, role):
439
439
return 'arn:{0}:iam::{1}:role/{2}' .format (prefix , account_id , role )
440
440
441
441
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 ):
443
443
"""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
+ )
445
448
return client .get_caller_identity ().get ('Account' )
446
449
447
450
@@ -464,7 +467,7 @@ def create_function(cfg, path_to_zip_file, *use_s3, **s3_file):
464
467
aws_access_key_id = cfg .get ('aws_access_key_id' )
465
468
aws_secret_access_key = cfg .get ('aws_secret_access_key' )
466
469
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' ) )
468
471
role = get_role_name (
469
472
cfg .get ('region' ), account_id ,
470
473
cfg .get ('role' , 'lambda_basic_execution' ),
@@ -534,7 +537,7 @@ def update_function(cfg, path_to_zip_file, *use_s3, **s3_file):
534
537
aws_access_key_id = cfg .get ('aws_access_key_id' )
535
538
aws_secret_access_key = cfg .get ('aws_secret_access_key' )
536
539
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' ) )
538
541
role = get_role_name (
539
542
cfg .get ('region' ), account_id ,
540
543
cfg .get ('role' , 'lambda_basic_execution' ),
0 commit comments