Merge pull request nficano#21 from philchristensen/patch-1

nficano · web-flow · commit 391290d729b8 · 2016-12-06T23:58:56.000-05:00
Use STS to fetch the account ID instead of IAM
diff --git a/aws_lambda/aws_lambda.py b/aws_lambda/aws_lambda.py
@@ -264,9 +264,9 @@ def get_role_name(account_id, role):
 
 
 def get_account_id(aws_access_key_id, aws_secret_access_key):
- """Query IAM for a users' account_id"""
- client = get_client('iam', aws_access_key_id, aws_secret_access_key)
- return client.get_user()['User']['Arn'].split(':')[4]
+ """Query STS for a users' account_id"""
+ client = get_client('sts', aws_access_key_id, aws_secret_access_key)
+ return client.get_caller_identity().get('Account')
 
 
 def get_client(client, aws_access_key_id, aws_secret_access_key, region=None):

-Original file line number
+Diff line change
 defget_account_id(aws_access_key_id, aws_secret_access_key):
 -"""Query IAM for a users' account_id"""
 -client=get_client('iam', aws_access_key_id, aws_secret_access_key)
 -returnclient.get_user()['User']['Arn'].split(':')[4]
 +"""Query STS for a users' account_id"""
 +client=get_client('sts', aws_access_key_id, aws_secret_access_key)
 +returnclient.get_caller_identity().get('Account')
 defget_client(client, aws_access_key_id, aws_secret_access_key, region=None):