Skip to content

Fix for GovCloud support #70

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

Merged
nficano merged 1 commit into from
Sep 18, 2017
Merged

Fix for GovCloud support #70

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
13 changes: 9 additions & 4 deletions aws_lambda/aws_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
from .helpers import timestamp


ARN_PREFIXES = {
'us-gov-west-1': 'aws-us-gov'
}

log = logging.getLogger(__name__)


Expand Down Expand Up @@ -358,9 +362,10 @@ def pip_install_to_target(path, requirements=False, local_package=None):
_install_packages(path, packages)


def get_role_name(account_id, role):
def get_role_name(region, account_id, role):
"""Shortcut to insert the `account_id` and `role` into the iam string."""
return 'arn:aws:iam::{0}:role/{1}'.format(account_id, role)
prefix = ARN_PREFIXES.get(region, 'aws')
return 'arn:{0}:iam::{1}:role/{2}'.format(prefix, account_id, role)


def get_account_id(aws_access_key_id, aws_secret_access_key):
Expand Down Expand Up @@ -389,7 +394,7 @@ def create_function(cfg, path_to_zip_file):
aws_secret_access_key = cfg.get('aws_secret_access_key')

account_id = get_account_id(aws_access_key_id, aws_secret_access_key)
role = get_role_name(account_id, cfg.get('role', 'lambda_basic_execution'))
role = get_role_name(cfg.get('region'), account_id, cfg.get('role', 'lambda_basic_execution'))

client = get_client(
'lambda', aws_access_key_id, aws_secret_access_key,
Expand Down Expand Up @@ -436,7 +441,7 @@ def update_function(cfg, path_to_zip_file):
aws_secret_access_key = cfg.get('aws_secret_access_key')

account_id = get_account_id(aws_access_key_id, aws_secret_access_key)
role = get_role_name(account_id, cfg.get('role', 'lambda_basic_execution'))
role = get_role_name(cfg.get('region'), account_id, cfg.get('role', 'lambda_basic_execution'))

client = get_client(
'lambda', aws_access_key_id, aws_secret_access_key,
Expand Down