Skip to content

added cli option to preserve VPC settings on update; fixes #78 #116

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
soapergem merged 5 commits into from
Sep 7, 2018
Merged

added cli option to preserve VPC settings on update; fixes #78 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e0831a
added cli option to preserve VPC settings on update
gmyers-amfam Jun 13, 2018
28916f0
calling function with kwargs parameter
gmyers-amfam Jul 9, 2018
b4de0d5
fixed issue with accessing existing configuration
gmyers-amfam Sep 5, 2018
d41e868
falling back to config file in case of failed lookup
gmyers-amfam Sep 5, 2018
006fda5
added none-safety check
gmyers-amfam Sep 5, 2018
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
25 changes: 19 additions & 6 deletions aws_lambda/aws_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def cleanup_old_versions(
def deploy(
src, requirements=None, local_package=None,
config_file='config.yaml', profile_name=None,
preserve_vpc=False
):
"""Deploys a new function to AWS Lambda.

Expand All @@ -111,14 +112,15 @@ def deploy(

existing_config = get_function_config(cfg)
if existing_config:
update_function(cfg, path_to_zip_file, existing_config)
update_function(cfg, path_to_zip_file, existing_config, preserve_vpc=preserve_vpc)
else:
create_function(cfg, path_to_zip_file)


def deploy_s3(
src, requirements=None, local_package=None,
config_file='config.yaml', profile_name=None,
preserve_vpc=False
):
"""Deploys a new function via AWS S3.

Expand Down Expand Up @@ -147,7 +149,7 @@ def deploy_s3(
existing_config = get_function_config(cfg)
if existing_config:
update_function(cfg, path_to_zip_file, existing_config, use_s3=use_s3,
s3_file=s3_file)
s3_file=s3_file, preserve_vpc=preserve_vpc)
else:
create_function(cfg, path_to_zip_file, use_s3=use_s3, s3_file=s3_file)

Expand Down Expand Up @@ -580,7 +582,7 @@ def create_function(cfg, path_to_zip_file, use_s3=False, s3_file=None):


def update_function(
cfg, path_to_zip_file, existing_cfg, use_s3=False, s3_file=None
cfg, path_to_zip_file, existing_cfg, use_s3=False, s3_file=None, preserve_vpc=False
):
"""Updates the code of an existing Lambda function"""

Expand Down Expand Up @@ -632,11 +634,22 @@ def update_function(
'Description': cfg.get('description'),
'Timeout': cfg.get('timeout', 15),
'MemorySize': cfg.get('memory_size', 512),
'VpcConfig': {
}

if preserve_vpc:
kwargs['VpcConfig'] = existing_cfg.get('Configuration', {}).get('VpcConfig')
if kwargs['VpcConfig'] is None:
kwargs['VpcConfig'] = {
'SubnetIds': cfg.get('subnet_ids', []),
'SecurityGroupIds': cfg.get('security_group_ids', []),
}
else:
del kwargs['VpcConfig']['VpcId']
else:
kwargs['VpcConfig'] = {
'SubnetIds': cfg.get('subnet_ids', []),
'SecurityGroupIds': cfg.get('security_group_ids', []),
},
}
}

if 'environment_variables' in cfg:
kwargs.update(
Expand Down
9 changes: 8 additions & 1 deletion scripts/lambda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,20 @@ def invoke(event_file, config_file, profile, verbose):
help='Install local package as well.',
multiple=True,
)
def deploy(requirements, local_package, config_file, profile):
@click.option(
'--preserve-vpc',
default=False,
is_flag=True,
help='Preserve VPC configuration on existing functions',
)
def deploy(requirements, local_package, config_file, profile, preserve_vpc):
aws_lambda.deploy(
CURRENT_DIR,
requirements=requirements,
local_package=local_package,
config_file=config_file,
profile_name=profile,
preserve_vpc=preserve_vpc,
)


Expand Down