Skip to content

Add the ability to set tags on a function #99

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 5 commits into from
Mar 20, 2018
Merged

Add the ability to set tags on a function #99

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
2f8aa9a
Add the ability to set tags on a function
Feb 23, 2018
1502173
Updating template to include example for tags.
Feb 23, 2018
b866652
For python3, force tags to be a list (instead of the default dict_keys).
Feb 23, 2018
7d2c2b4
Fix detection of existing tags when updating a function. `Tags` key …
Mar 6, 2018
b1b820a
Fix untagging when `Tags` key is not present.
Mar 6, 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
41 changes: 33 additions & 8 deletions aws_lambda/aws_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ def deploy(
local_package=local_package,
)

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

Expand Down Expand Up @@ -143,8 +144,10 @@ def deploy_s3(

use_s3 = True
s3_file = upload_s3(cfg, path_to_zip_file, use_s3)
if function_exists(cfg):
update_function(cfg, path_to_zip_file, use_s3=use_s3, s3_file=s3_file)
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)
else:
create_function(cfg, path_to_zip_file, use_s3=use_s3, s3_file=s3_file)

Expand Down Expand Up @@ -538,6 +541,14 @@ def create_function(cfg, path_to_zip_file, use_s3=False, s3_file=None):
'Publish': True,
}

if 'tags' in cfg:
kwargs.update(
Tags={
key: str(value)
for key, value in cfg.get('tags').items()
}
)

if 'environment_variables' in cfg:
kwargs.update(
Environment={
Expand All @@ -552,7 +563,9 @@ def create_function(cfg, path_to_zip_file, use_s3=False, s3_file=None):
client.create_function(**kwargs)


def update_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
):
"""Updates the code of an existing Lambda function"""

print('Updating your Lambda function')
Expand Down Expand Up @@ -620,7 +633,18 @@ def update_function(cfg, path_to_zip_file, use_s3=False, s3_file=None):
},
)

client.update_function_configuration(**kwargs)
ret = client.update_function_configuration(**kwargs)

if 'tags' in cfg:
tags = {
key: str(value)
for key, value in cfg.get('tags').items()
}
if tags != existing_cfg.get('Tags'):
if existing_cfg.get('Tags'):
client.untag_resource(Resource=ret['FunctionArn'],
TagKeys=list(existing_cfg['Tags'].keys()))
client.tag_resource(Resource=ret['FunctionArn'], Tags=tags)


def upload_s3(cfg, path_to_zip_file, *use_s3):
Expand Down Expand Up @@ -663,8 +687,8 @@ def upload_s3(cfg, path_to_zip_file, *use_s3):
return filename


def function_exists(cfg):
"""Check whether a function exists or not"""
def get_function_config(cfg):
"""Check whether a function exists or not and return its config"""

function_name = cfg.get('function_name')
profile_name = cfg.get('profile')
Expand All @@ -681,6 +705,7 @@ def function_exists(cfg):
if 'Function not found' in str(e):
return False


def read_cfg(path_to_config_file, profile_name):
cfg = read(path_to_config_file, loader=yaml.load)
if profile_name is not None:
Expand Down
7 changes: 7 additions & 0 deletions aws_lambda/project_templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ environment_variables:
env_1: foo
env_2: baz

# If `tags` is uncommented then tags will be set at creation or update
# time. During an update all other tags will be removed except the tags
# listed here.
#tags:
# tag_1: foo
# tag_2: bar

# Build options
build:
source_directories: lib # a comma delimited list of directories in your project root that contains source to package.