Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #755 from dtenenba/master

Browse Source 
bump tag limit from 10 to 50 to align with actual AWS limit
This commit is contained in:
Steve Pulec 2016-11-06 09:52:20 -05:00 committed by GitHub
commit 44636d1f73
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ec2/models.py
View File

@ -815,9 +815,9 @@ class TagBackend(object):
raise InvalidParameterValueErrorTagNull() raise InvalidParameterValueErrorTagNull()
for resource_id in resource_ids: for resource_id in resource_ids:
if resource_id in self.tags: if resource_id in self.tags:
if len(self.tags[resource_id]) + len([tag for tag in tags if not tag.startswith("aws:")]) > 10: if len(self.tags[resource_id]) + len([tag for tag in tags if not tag.startswith("aws:")]) > 50:
raise TagLimitExceeded() raise TagLimitExceeded()
elif len([tag for tag in tags if not tag.startswith("aws:")]) > 10: elif len([tag for tag in tags if not tag.startswith("aws:")]) > 50:
raise TagLimitExceeded() raise TagLimitExceeded()
for resource_id in resource_ids: for resource_id in resource_ids:
for tag in tags: for tag in tags:

14
tests/test_ec2/test_tags.py
View File

@ -113,17 +113,9 @@ def test_tag_limit_exceeded():
conn = boto.connect_ec2('the_key', 'the_secret') conn = boto.connect_ec2('the_key', 'the_secret')
reservation = conn.run_instances('ami-1234abcd') reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0] instance = reservation.instances[0]
tag_dict = {'01': '', tag_dict = {}
'02': '', for i in range(51):
'03': '', tag_dict['{0:02d}'.format(i+1)] = ''
'04': '',
'05': '',
'06': '',
'07': '',
'08': '',
'09': '',
'10': '',
'11': ''}
with assert_raises(EC2ResponseError) as cm: with assert_raises(EC2ResponseError) as cm:
conn.create_tags(instance.id, tag_dict) conn.create_tags(instance.id, tag_dict)