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

Use a dict instead of a list for storing task definition revisions

Browse Source 
Before when a task definition revision was de-registered all revisions
after that changed their revision id. This doesn't match the way it is
handled in AWS. Using a hash and manually increment the revision id
solves that.
This commit is contained in:
Michael van Tellingen 2019-07-26 12:55:05 +02:00
parent 9346a999d8
commit feef7b2b5a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
moto/ecs/models.py
View File

@ -422,11 +422,9 @@ class EC2ContainerServiceBackend(BaseBackend):
revision = int(revision) revision = int(revision)
else: else:
family = task_definition_name family = task_definition_name
revision = len(self.task_definitions.get(family, [])) revision = self._get_last_task_definition_revision_id(family)
if family in self.task_definitions and 0 < revision <= len(self.task_definitions[family]): if family in self.task_definitions and revision in self.task_definitions[family]:
return self.task_definitions[family][revision - 1]
elif family in self.task_definitions and revision == -1:
return self.task_definitions[family][revision] return self.task_definitions[family][revision]
else: else:
raise Exception( raise Exception(
@ -468,13 +466,14 @@ class EC2ContainerServiceBackend(BaseBackend):
def register_task_definition(self, family, container_definitions, volumes): def register_task_definition(self, family, container_definitions, volumes):
if family in self.task_definitions: if family in self.task_definitions:
revision = len(self.task_definitions[family]) + 1 last_id = self._get_last_task_definition_revision_id(family)
revision = (last_id or 0) + 1
else: else:
self.task_definitions[family] = [] self.task_definitions[family] = {}
revision = 1 revision = 1
task_definition = TaskDefinition( task_definition = TaskDefinition(
family, revision, container_definitions, volumes) family, revision, container_definitions, volumes)
self.task_definitions[family].append(task_definition) self.task_definitions[family][revision] = task_definition
return task_definition return task_definition
@ -484,16 +483,18 @@ class EC2ContainerServiceBackend(BaseBackend):
""" """
task_arns = [] task_arns = []
for task_definition_list in self.task_definitions.values(): for task_definition_list in self.task_definitions.values():
task_arns.extend( task_arns.extend([
[task_definition.arn for task_definition in task_definition_list]) task_definition.arn
for task_definition in task_definition_list.values()
])
return task_arns return task_arns
def deregister_task_definition(self, task_definition_str): def deregister_task_definition(self, task_definition_str):
task_definition_name = task_definition_str.split('/')[-1] task_definition_name = task_definition_str.split('/')[-1]
family, revision = task_definition_name.split(':') family, revision = task_definition_name.split(':')
revision = int(revision) revision = int(revision)
if family in self.task_definitions and 0 < revision <= len(self.task_definitions[family]): if family in self.task_definitions and revision in self.task_definitions[family]:
return self.task_definitions[family].pop(revision - 1) return self.task_definitions[family].pop(revision)
else: else:
raise Exception( raise Exception(
"{0} is not a task_definition".format(task_definition_name)) "{0} is not a task_definition".format(task_definition_name))
@ -950,6 +951,11 @@ class EC2ContainerServiceBackend(BaseBackend):
yield task_fam yield task_fam
def _get_last_task_definition_revision_id(self, family):
definitions = self.task_definitions.get(family, {})
if definitions:
return max(definitions.keys())
available_regions = boto3.session.Session().get_available_regions("ecs") available_regions = boto3.session.Session().get_available_regions("ecs")
ecs_backends = {region: EC2ContainerServiceBackend(region) for region in available_regions} ecs_backends = {region: EC2ContainerServiceBackend(region) for region in available_regions}