Updated mechanism through which current Account Id is acquired

Author: Dave Osment

ebs-snapshot-manager.py

@@ -3,7 +3,6 @@
 import datetime
 
 ec = boto3.client('ec2')
-iam = boto3.client('iam')
 
 """
 This function looks at *all* snapshots that have a "DeleteOn" tag containing
@@ -12,21 +11,8 @@
 """
 
 def lambda_handler(event, context):
-    account_ids = list()
-    try:
-        """
-        You can replace this try/except by filling in `account_ids` yourself.
-        Get your account ID with:
-        > import boto3
-        > iam = boto3.client('iam')
-        > print iam.get_user()['User']['Arn'].split(':')[4]
-        """
-        iam.get_user()
-    except Exception as e:
-        # use the exception message to get the account ID the function executes under
-        account_ids.append(re.search(r'(arn:aws:sts::)([0-9]+)', str(e)).groups()[1])
-
-
+    account_ids = (boto3.client('sts').get_caller_identity()['Account'])
+    
     delete_on = datetime.date.today().strftime('%Y-%m-%d')
         # limit snapshots to process to ones marked for deletion on this day
         # AND limit snapshots to process to ones that are automated only
@@ -35,7 +21,7 @@ def lambda_handler(event, context):
         { 'Name': 'tag:DeleteOn', 'Values': [delete_on] },
         { 'Name': 'tag:Type', 'Values': ['Automated'] },
     ]
-    snapshot_response = ec.describe_snapshots(OwnerIds=account_ids, Filters=filters)
+    snapshot_response = ec.describe_snapshots(OwnerIds=[account_ids], Filters=filters)
 
     for snap in snapshot_response['Snapshots']:
         for tag in snap['Tags']:
@@ -50,4 +36,4 @@ def lambda_handler(event, context):
             # do nothing else
         else:
             print "Deleting snapshot %s" % snap['SnapshotId']
-            ec.delete_snapshot(SnapshotId=snap['SnapshotId'])
+            ec.delete_snapshot(SnapshotId=snap['SnapshotId'])