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

Allow black to reformat correctly

Browse Source
This commit is contained in:
Don Kuntz 2020-01-09 23:45:14 -06:00
parent 2cb3f327de
commit fd1fdde1bf
No known key found for this signature in database
GPG Key ID: BC10CA5C55EEE343
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/ecs/models.py
View File

@ -134,7 +134,7 @@ class TaskDefinition(BaseObject):
else: else:
self.volumes = volumes self.volumes = volumes
if network_mode is None: if network_mode is None:
self.network_mode = 'bridge' self.network_mode = "bridge"
else: else:
self.network_mode = network_mode self.network_mode = network_mode
@ -567,7 +567,13 @@ class EC2ContainerServiceBackend(BaseBackend):
self.task_definitions[family] = {} self.task_definitions[family] = {}
revision = 1 revision = 1
task_definition = TaskDefinition( task_definition = TaskDefinition(
family, revision, container_definitions, self.region_name, volumes=volumes, network_mode=network_mode, tags=tags family,
revision,
container_definitions,
self.region_name,
volumes=volumes,
network_mode=network_mode,
tags=tags,
) )
self.task_definitions[family][revision] = task_definition self.task_definitions[family][revision] = task_definition

8
moto/ecs/responses.py
View File

@ -62,9 +62,13 @@ class EC2ContainerServiceResponse(BaseResponse):
container_definitions = self._get_param("containerDefinitions") container_definitions = self._get_param("containerDefinitions")
volumes = self._get_param("volumes") volumes = self._get_param("volumes")
tags = self._get_param("tags") tags = self._get_param("tags")
network_mode = self._get_param('networkMode') network_mode = self._get_param("networkMode")
task_definition = self.ecs_backend.register_task_definition( task_definition = self.ecs_backend.register_task_definition(
family, container_definitions, volumes=volumes, network_mode=network_mode, tags=tags, family,
container_definitions,
volumes=volumes,
network_mode=network_mode,
tags=tags,
) )
return json.dumps({"taskDefinition": task_definition.response_object}) return json.dumps({"taskDefinition": task_definition.response_object})

4
tests/test_ecs/test_ecs_boto3.py
View File

@ -94,7 +94,7 @@ def test_register_task_definition():
"logConfiguration": {"logDriver": "json-file"}, "logConfiguration": {"logDriver": "json-file"},
} }
], ],
networkMode='bridge', networkMode="bridge",
tags=[ tags=[
{"key": "createdBy", "value": "moto-unittest"}, {"key": "createdBy", "value": "moto-unittest"},
{"key": "foo", "value": "bar"}, {"key": "foo", "value": "bar"},
@ -125,7 +125,7 @@ def test_register_task_definition():
response["taskDefinition"]["containerDefinitions"][0]["logConfiguration"][ response["taskDefinition"]["containerDefinitions"][0]["logConfiguration"][
"logDriver" "logDriver"
].should.equal("json-file") ].should.equal("json-file")
response['taskDefinition']['networkMode'].should.equal('bridge') response["taskDefinition"]["networkMode"].should.equal("bridge")
@mock_ecs @mock_ecs